Changeset 710

Timestamp:

01/04/10 13:22:31 (2 years ago)

Author:

nate

Message:

• Changed imports to incorporate changes made to tables.php (as a result of uuids).

Location:

trunk/phpbms

Files:

• include/imports.php (modified) (4 diffs)
• modules/bms/include/clients.php (modified) (3 diffs)

trunk/phpbms/include/imports.php

@@ -108 +108 @@
                 //DO NOT CALL IN TRANSACTION
                 function _storeTempCSV($fileName){
-
+                        
                         $querystatement = "
                                 INSERT INTO
                                         `files`
                                         (
+                                                `uuid`,
                                                 `name`,
                                                 `description`,
@@ -124 +125 @@
                                         VALUES
                                         (
+                                                '".uuid(getUuidPrefix($this->table->db, "tbld:80b4f38d-b957-bced-c0a0-ed08a0db6475"))."',
                                                 'temporary',
                                                 'This is a temporary import file',
                                                 '".$this->_getFile($fileName)."',
                                                 'phpbms/temp',
-                                                '-100',
+                                                'Admin',
                                                 NOW(),
                                                 '".$_SESSION["userinfo"]["id"]."',
@@ -253 +255 @@
                                                 if($rowFieldNum == $fieldNum){
                                                         $verify = $this->table->verifyVariables($trimmedRowData);
-                                                        if(!count($verify))
-                                                                $theid = $this->table->insertRecord($trimmedRowData, NULL, true);
+                                                        if(!count($verify)){
+                                                                $createdby = NULL;
+                                                                $overrideID = true;
+                                                                $replace = false;
+                                                                if(!isset($trimmedRowData["uuid"])){
+                                                                        $useUuid = true;
+                                                                        $thereturn = $this->table->insertRecord($trimmedRowData, $createdby, $overrideID, $replace, $useUuid);
+                                                                        $theid = $thereturn["id"];
+                                                                }else{
+                                                                        $useUuid = false;
+                                                                        $thereturn = $this->table->insertRecord($trimmedRowData, $createdby, $overrideID, $replace, $useUuid);
+                                                                        $theid = $thereturn;
+                                                                }
+                                                        }//end if
                                                 }else
                                                         $this->error .= '<li> incorrect amount of fields for line number '.$rowNum.'.</li>';
@@ -476 +490 @@
                                         <input id="cancelButton<?php echo $ids?>" name="command" type="submit" value="cancel" class="Buttons" <?php if($ids==1) {?>accesskey="x" <?php }?> title="(access key+x)" />
                                         <?php }else{?>
-                                        <input type="submit" class="Buttons" value="import" name="command" id="import<?php echo $ids?>" title="commit" <?php echo ($numberOfRecords? '':'disabled="disabled"') ?>/>
-                                        <input type="submit" class="Buttons" value="cancel" name="command" id="cancelButton<?php echo $ids?>" title="rollback"/>
+                                        <input type="submit" class="Buttons" value="import" name="command" id="import<?php echo $ids?>" title="commit" <?php if($ids==1) {?>accesskey="i"<?php }?> <?php echo ($numberOfRecords? '':'disabled="disabled"') ?>/>
+                                        <input type="submit" class="Buttons" value="cancel" name="command" id="cancelButton<?php echo $ids?>" <?php if($ids==1) {?>accesskey="x"<?php }?> title="rollback"/>
                                         <?php }//end if ?>
                                 </div><?php

trunk/phpbms/modules/bms/include/clients.php

@@ -1249 +1249 @@
                                                 if($rowFieldNum == $fieldNum){
                                                         $verify = $this->table->verifyVariables($trimmedRowData);
-                                                        if(!count($verify))
-                                                                $theid = $this->table->insertRecord($trimmedRowData, NULL, true);
+                                                        if(!count($verify)){
+                                                                $createdby = NULL;
+                                                                $overrideID = true;
+                                                                $replace = false;
+                                                                if(!isset($trimmedRowData["uuid"])){
+                                                                        $useUuid = true;
+                                                                        $thereturn = $this->table->insertRecord($trimmedRowData, $createdby, $overrideID, $replace, $useUuid);
+                                                                        $theid = $thereturn["id"];
+                                                                }else{
+                                                                        $useUuid = false;
+                                                                        $thereturn = $this->table->insertRecord($trimmedRowData, $createdby, $overrideID, $replace, $useUuid);
+                                                                        $theid = $thereturn;
+                                                                }//end if
+                                                        }//end if
+                                                                
                                                 }else
                                                         $this->error .= '<li> incorrect amount of fields for line number '.$rowNum.'.</li>';
@@ -1398 +1411 @@
                                                         `addresses`.`phone`
                                                 FROM
-                                                        ((clients INNER JOIN addresstorecord ON clients.id = addresstorecord.recordid AND addresstorecord.tabledefid=2 AND addresstorecord.primary=1) INNER JOIN addresses ON  addresstorecord.addressid = addresses.id)
+                                                        ((clients INNER JOIN addresstorecord ON clients.uuid = addresstorecord.recordid AND addresstorecord.tabledefid='tbld:6d290174-8b73-e199-fe6c-bcf3d4b61083' AND addresstorecord.primary='1') INNER JOIN addresses ON  addresstorecord.addressid = addresses.uuid)
                                                 WHERE
                                                         `clients`.`id` IN (".$inStatement.")
@@ -1418 +1431 @@
 
                 function displayTransaction($recordsArray, $fieldsArray){
-
+                        
                         if(count($recordsArray) && count($fieldsArray)){