pyc-website

commit bcca5427bdd0ae64ca7e6bb0cb4da29eb0861ba7
parent ee36c2aaf927a861ae237e8a2196a41469c40d83
Author: Jul <jul@9o.is>
Date:   Wed, 21 May 2014 17:27:31 -0400

switched to mongo's ConnectionIdentifier and fixed save mongo overwrite in searchedpostal

Diffstat:
M
src/main/scala/inc/pyc/config/MongoConfig.scala
 | 
7
++++---
M
src/main/scala/inc/pyc/lib/RogueMetaRecord.scala
 | 
2
+-
M
src/main/scala/inc/pyc/model/SearchedPostal.scala
 | 
2
+-

3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/scala/inc/pyc/config/MongoConfig.scala b/src/main/scala/inc/pyc/config/MongoConfig.scala
@@ -3,6 +3,7 @@ package config
 
 import net.liftweb._
 import common._
+import util._
 import http._
 import json._
 import mongodb._
@@ -13,7 +14,7 @@ import com.mongodb.{DBAddress, MongoClient}
 object MongoConfig extends Factory with Loggable {
 
   // configure your MongoMetaRecords to use this. See lib/RogueMetaRecord.scala.
-  val defaultId = new FactoryMaker[MongoIdentifier](DefaultMongoIdentifier) {}
+  val defaultId = new FactoryMaker[ConnectionIdentifier](DefaultConnectionIdentifier) {}
 
   def init() {
     /**
@@ -35,7 +36,7 @@ object MongoConfig extends Factory with Loggable {
     (Props.get("mongo.default.user"), Props.get("mongo.default.pwd")) match {
       case (Full(user), Full(pwd)) =>
         MongoDB.defineDbAuth(
-          DefaultMongoIdentifier,
+          DefaultConnectionIdentifier,
           new MongoClient(defaultDbAddress),
           defaultDbAddress.getDBName,
           user,
@@ -44,7 +45,7 @@ object MongoConfig extends Factory with Loggable {
         logger.info("MongoDB inited using authentication: %s".format(defaultDbAddress.toString))
       case _ =>
         MongoDB.defineDb(
-          DefaultMongoIdentifier,
+          DefaultConnectionIdentifier,
           new MongoClient(defaultDbAddress),
           defaultDbAddress.getDBName
         )
diff --git a/src/main/scala/inc/pyc/lib/RogueMetaRecord.scala b/src/main/scala/inc/pyc/lib/RogueMetaRecord.scala
@@ -14,5 +14,5 @@ import com.foursquare.rogue._
 trait RogueMetaRecord[A <: MongoRecord[A]] extends MongoMetaRecord[A] with LiftRogue {
   self: A =>
 
-  override def mongoIdentifier = MongoConfig.defaultId.vend
+  override def connectionIdentifier = MongoConfig.defaultId.vend
 }
diff --git a/src/main/scala/inc/pyc/model/SearchedPostal.scala b/src/main/scala/inc/pyc/model/SearchedPostal.scala
@@ -17,7 +17,7 @@ class SearchedPostal private () extends MongoRecord[SearchedPostal] with ObjectI
   /* The postal code that was searched. */
   object postal extends PostalCodeField(this, meta.usa)
   
-  override def save = {
+  override def save(safe: Boolean = true) = {
     val qry = SearchedPostal.find(this)
     
     if(qry.get().isDefined) {