Changeset 621 for trunk/phpbms/include

Timestamp:

06/25/09 17:55:57 (3 years ago)

Author:

nate

Message:

• Initial changes to make the api use both uuids and ids, if possible.
• An "options" object was added to the api's request array of objects. It currently has one option: useUuids. This toggles whether to use the id or the uuid in the update/get/delete commands.
• Changes to delete, insertRecord, updateRecord commands in the main phpbms table / searchfunction classes and also the class extensions.

Location:

trunk/phpbms/include

Files:

• search_class.php (modified) (4 diffs)
• tables.php (modified) (6 diffs)

trunk/phpbms/include/search_class.php

@@ -294 +294 @@
                         $this->db->logError=false;
                         $this->db->stopOnError=false;
-//echo "<pre>";
-//var_dump($_SESSION["thequerystatement"]);
-//exit;
+
                         $this->queryresult = $this->db->query($_SESSION["thequerystatement"]);
 
@@ -1221 +1219 @@
 
 
-                function delete_record(){
-
-                        $whereclause=$this->buildWhereClause();
+                function delete_record($useUUID = false){
+
+                        if(!$useUUID)
+                                $whereclause=$this->buildWhereClause();
+                        else
+                                $whereclause = $this->buildWhereClause($this->maintable.".uuid");
 
                         $endmessage="";
@@ -1236 +1237 @@
                                         $endmessage=" deleted";
                         }
+                        
                         $queryresult = $this->db->query($querystatement);
                         $message = $this->buildStatusMessage().$endmessage;
@@ -1252 +1254 @@
                         $whereclause="";
                         foreach($idsArray as $theid){
-                                $whereclause.=" OR ".$fieldphrase."=".$theid;
+                                $whereclause.=" OR ".$fieldphrase."='".$theid."'";
                         }
                         $whereclause=substr($whereclause,3);

trunk/phpbms/include/tables.php

@@ -504 +504 @@
 
         /**
+         * function updateRecord
+         *
          * updates a record
          *
@@ -510 +512 @@
          *                             If the modified is not passed or is NULL the function will use
          *                             the currently logged in user.
-         * @param bool $useUuid specifies whther the $id is a uuid (true) or not.  Default is false.
+         * @param bool $useUuid specifies whther to use the id or the uuid (true) in the whereclause.  Default is false.
          *
          * @return bool true or false depending upon update success
@@ -582 +584 @@
                 $updatestatement .= "
                     WHERE
-                        `uuid` = '".mysql_real_escape_string($variables["id"])."'";
+                        `uuid` = '".mysql_real_escape_string($variables["uuid"])."'";
 
             }//endif
@@ -600 +602 @@
          * @param bool $overrideID
          * @param bool $replace use the SQL replace statement (true) instead of insert (false, deault)
-         * @param bool $useUuid generates a uuid and specifies the function to retrn the an array with uuid and id instead of just the id
+         * @param bool $useUuid generates a uuid and specifies the function to retrn an array with uuid and id instead of just the id
          *
          * @return int|array|bool retruns the id of the newly created record of false on error.  If $useUuid is set to true, it will
@@ -624 +626 @@
                     switch($fieldname){
                         case "id":
-                            if($overrideID && $variables["id"]){
-
-                                $fieldlist .= "id, ";
-                                $insertvalues .= ((int) $variables["id"]).", ";
+                            if($overrideID && isset($variables["id"])){
+
+                                if($variables["id"]){
+                                    $fieldlist .= "id, ";
+                                    $insertvalues .= ((int) $variables["id"]).", ";
+                                }//end if
 
                             }//endif
@@ -678 +682 @@
 
                 $fieldlist .= "`uuid`, ";
-                $insertvalues .= "'".uuid($this->prefix.":")."', ";
+                $variables["uuid"] = uuid($this->prefix.":");
+                $insertvalues .= "'".$variables["uuid"]."', ";
 
             }//endif