WebSVN – computer_asset_manager_v1 – Diff – /modules/sysinfo/cli_tools/parse_sysinfo.php

+ *
  * V0.9.2 20160217 RWR
  * Fixed issue where if a device was marked as part of a Xen machine, it
  * was being deleted by pci updates.
  * Fixed issue where serial number was not being updated
+ *
+ * v0.9.3 20200218 RWR
+ * Fixed invalid table name (attrib_device vs device_attrib) and set up to read a new section, attributes
+ *
 */
 require 'library.php';
-$VERSION='0.9.2';
+$VERSION='0.9.3';
 class sysinfo {
    private $report; // this will hold an entire report
    private $messages = array();
       $this->updateBootTime();
       $this->doIPAddresses();
       $this->processPCI();
       $this->processSoftwarePackages();
       $this->processXen();
+      $this->processAttributes();
       // at this point, we don't really need the report title information
       // so we will remove it before recordReport has a chance to put it
       // in database
       array_shift( $this->messages );
       // now record the report
          $this->returnCode = 6;
          return "New entry detected, but entry already made. You must update Camp before this can be processed";
+      }
+   }
-   // simply used to get an attrib_id. If it does not exit, will create it
+   // simply used to get an attrib_id. If it does not exist, will create it
    private function getAttributeID ( $attributeName, $reportDate ) {
       $attributeName = makeSafeSQLValue( $attributeName );
       $result = getOneDBValue( "select attrib_id from attrib where name = $attributeName and removed_date is null" );
       if ( !isset( $result) ) {
          $value1 == $value2;
+   }
    /*
-    * Checks an attribute from the device_attriburtes table. If the value has
+    * Checks an attribute from the attrib_deviceurtes table. If the value has
     * changed, sets the old one's removed_date to this report date, then adds
     * new record for new value.
     * If value is not off by more than $slop, will not update. Useful for memory and speed on
     * virtual devices where the values may be slightly different at different readings
     * If the record does not exist, simply creates it
       if ( !isset($attribute) || !isset($value ) ) {
          $this->messages[] = "Error: attempt to use null value for [$attribute], value [$value] for ID $this->machineID in checkAndUPdateAttribute";
          return false;
+      }
       $attrib_id = $this->getAttributeID( $attribute, $this->reportDateSQL );
-      $result = getOneDBValue( "select device_attrib.value
+      $result = getOneDBValue( "select attrib_device.value
-         from device_attrib join attrib using (attrib_id)
+         from attrib_device join attrib using (attrib_id)
-         where device_attrib.device_id = $this->machineID
+         where attrib_device.device_id = $this->machineID
-               and device_attrib.removed_date is null
+               and attrib_device.removed_date is null
                and attrib.attrib_id = $attrib_id
          ");
       if ( isset( $result ) && ! $this->sloppyEqual( $value, $result, $slop ) ) { # got it, now see if it compares ok
          $this->messages[] = "New value [$value] for $attribute for device $this->machineID, voiding previous";
          $value = makeSafeSQLValue($value); # we want to always quote the value on this particular one
-         queryDatabaseExtended( "update device_attrib
+         queryDatabaseExtended( "update attrib_device
                                     set removed_date = '$this->reportDateSQL'
                                  where device_id = $this->machineID
                                        and attrib_id = $attrib_id
                                        and removed_date is null");
          unset( $result ); # this will force the insert in the next block of code
       } # if ($result)
       if ( ! isset( $result ) ) { # we have no valid entry for this attribute
-         //$this->messages[] = "In checkAndUpdateAttribute, adding new record with insert into device_attrib(device_id,attrib_id,value,added_date) values ($this->machineID,$attrib_id,$value,$this->reportDateSQL)";
+         //$this->messages[] = "In checkAndUpdateAttribute, adding new record with insert into attrib_device(device_id,attrib_id,value,added_date) values ($this->machineID,$attrib_id,$value,$this->reportDateSQL)";
-         queryDatabaseExtended( "insert into device_attrib(device_id,attrib_id,value,added_date)
+         queryDatabaseExtended( "insert into attrib_device(device_id,attrib_id,value,added_date)
                                  values ($this->machineID,$attrib_id,$value,'$this->reportDateSQL')");
          return true;
+      }
       return false;
    } // checkAndUpdateAttribute
             queryDatabaseExtended( "update device set serial = '$this->serialNumber' where device_id = $this->machineID" );
+         }
+      }
    } // updateComputerMakeup
+   /* several report entries are simply designed to add/update the attributes table (attrib_device), so we'll just go through them
+    * one by one
+    */
+   private function processAttributes() {
+      foreach ( $this->report['attributes'] as $key => $value ) {
+         $this->checkAndUpdateAttribute( $key, $value );
+      }
+   } // processAttributes
    // This is kind of funky, because column = null does not work, it must be column is null, so we have to look for it.
    function makeSQLEquals ( $field, $value ) {
       return "$field " . ( $value == 'null' ? 'is null' : '=' . $value );

Subversion Repositories computer_asset_manager_v1

(root)/modules/sysinfo/cli_tools/parse_sysinfo.php – Rev 36 → 110