Changeset 206

Timestamp:

03/27/07 11:44:14 (5 years ago)

Author:

brieb

Message:

Fixed install problems with scheduler.
Fixed convert to invoice function.
Expanded logging details for errors.

Location:

trunk/phpbms

Files:

• include/session.php (modified) (1 diff)
• install/createtables.sql (modified) (2 diffs)
• install/tableoptions.sql (modified) (1 diff)
• install/updatev0.7.sql (modified) (1 diff)
• modules/bms/include/invoices_search_functions.php (modified) (3 diffs)

trunk/phpbms/include/session.php

@@ -112 +112 @@
                 
         if($log && function_exists("sendLog")){
-                global $dblik;
+                global $dblink;
                 if(!isset($_SESSION["userinfo"]["id"]))
                         $_SESSION["userinfo"]["id"]="NULL";
-                sendLog($dblink,"ERROR",$id.":".$extras,$_SESSION["userinfo"]["id"]);
+                sendLog($dblink,"ERROR",$id.": ".$_SERVER["REQUEST_URI"]." -- ".$extras,$_SESSION["userinfo"]["id"]);
         }
         if($die) die();

trunk/phpbms/install/createtables.sql

@@ -276 +276 @@
 
 CREATE TABLE `scheduler` (
-  `id` int(10) unsigned NOT NULL,
+  `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
   `name` varchar(45) default NULL,
   `job` varchar(128) default NULL,
@@ -288 +288 @@
   `creationdate` datetime default NULL,
   `modifiedby` int(10) unsigned default NULL,
-  `modifieddate` timestamp NOT NULL default CURRENT_TIMESTAMP,
+  `modifieddate` TIMESTAMP,
   PRIMARY KEY  (`id`),
   KEY `inactivated` (`inactive`),

trunk/phpbms/install/tableoptions.sql

@@ -48 +48 @@
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `othercommand`, `roleid`) VALUES (201,'inactivate','inactivate',1,0);
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `othercommand`, `roleid`) VALUES (201,'runSelected','run job(s)',1,0);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`) VALUES (201,'name','scheduler.name','left','',0,'',0,'95%',NULL);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`) VALUES (201,'cron interval','scheduler.crontab','left','',1,'',0,'',NULL);
-INSERT INTO `tablecolumns` (`tabledefid`, `name`, `column`, `align`, `footerquery`, `displayorder`, `sortorder`, `wrap`, `size`, `format`) VALUES (201,'inactive','scheduler.inactive','center','',2,'',0,'','boolean');
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `othercommand`, `roleid`) VALUES (202,'new','0',0,0);
 INSERT INTO `tableoptions` (`tabledefid`, `name`, `option`, `othercommand`, `roleid`) VALUES (202,'select','1',0,0);

trunk/phpbms/install/updatev0.7.sql

@@ -66 +66 @@
 INSERT INTO `settings` (`name`, `value`) VALUES ('thousands_separator',',');
 INSERT INTO `settings` (`name`, `value`) VALUES ('demo_enabled','false');
-CREATE TABLE `scheduler` (`id` int(10) unsigned NOT NULL, `name` varchar(45) default NULL, `job` varchar(128) default NULL, `crontab` varchar(64) default NULL, `lastrun` datetime default NULL, `startdatetime` datetime NOT NULL, `enddatetime` datetime default NULL, `description` text, `inactive` tinyint(3) unsigned NOT NULL default '0', `createdby` int(10) unsigned default NULL, `creationdate` datetime default NULL, `modifiedby` int(10) unsigned default NULL, `modifieddate` timestamp NOT NULL default CURRENT_TIMESTAMP, PRIMARY KEY  (`id`), KEY `inactivated` (`inactive`), KEY `startdate` (`startdatetime`), KEY `enddate` (`enddatetime`));
+CREATE TABLE `scheduler` (`id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT, `name` varchar(45) default NULL, `job` varchar(128) default NULL, `crontab` varchar(64) default NULL, `lastrun` datetime default NULL, `startdatetime` datetime NOT NULL, `enddatetime` datetime default NULL, `description` text, `inactive` tinyint(3) unsigned NOT NULL default '0', `createdby` int(10) unsigned default NULL, `creationdate` datetime default NULL, `modifiedby` int(10) unsigned default NULL, `modifieddate` timestamp NOT NULL, PRIMARY KEY  (`id`), KEY `inactivated` (`inactive`), KEY `startdate` (`startdatetime`), KEY `enddate` (`enddatetime`));
 INSERT INTO `tabledefs` (`id`, `displayname`, `type`, `moduleid`, `maintable`, `querytable`, `editfile`, `editroleid`, `addfile`, `addroleid`, `searchroleid`, `advsearchroleid`, `viewsqlroleid`, `deletebutton`, `defaultwhereclause`, `defaultsortorder`, `defaultsearchtype`, `defaultcriteriafindoptions`, `defaultcriteriaselection`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`) VALUES (201,'Scheduler','system',1,'scheduler','scheduler','modules/base/scheduler_addedit.php',-100,'modules/base/scheduler_addedit.php',-100,-100,-100,-100,'delete','scheduler.id!=0','scheduler.name','','','',1,NOW(),1,NOW());
 INSERT INTO `tablefindoptions` (`tabledefid`, `name`, `search`, `displayorder`, `roleid`) VALUES (201,'all records','scheduler.id!=0',0,0);

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

@@ -110 +110 @@
 
         $whereclause=buildWhereClause($theids,"invoices.id");
-        $whereclause="(".$whereclause.") AND (invoices.type!=\"Invoice\" OR invoices.type!=\"VOID\") AND invoices.amountpaid=invoices.totalti;";
+        $whereclause="(".$whereclause.") AND (invoices.type!=\"Invoice\" OR invoices.type!=\"VOID\") AND invoices.amountpaid=invoices.totalti";
         
         //Look up default assignedto
@@ -121 +121 @@
                 $assignedtoid=$therecord["defaultassignedtoid"];
 
-        $querystatement = "UPDATE invoices SET invoices.type=\"Invoice\" invoices.invoicedate=ifnull(invoices.invoicedate,Now()),modifiedby=\"".$_SESSION["userinfo"]["id"]."\" WHERE".$whereclause;
+        $querystatement = "UPDATE invoices SET invoices.type=\"Invoice\", invoices.invoicedate=ifnull(invoices.invoicedate,Now()),modifiedby=\"".$_SESSION["userinfo"]["id"]."\" WHERE".$whereclause;
         $queryresult = mysql_query($querystatement,$dblink);
         if (!$queryresult) reportError(300,"Could not mark as invoice: ".mysql_error($dblink)." -- ".$querystatement);          
@@ -131 +131 @@
         $querystatement="SELECT id FROM invoices WHERE (".$whereclause.") AND statusid!=4";
         $queryresult = mysql_query($querystatement,$dblink);
+        if (!$queryresult) reportError(300,"Could not retrieve history for history cleaning: ".mysql_error($dblink)." -- ".$querystatement);            
         
         while($therecord=mysql_fetch_array($queryresult)){
-                $querystatement = "UPDATE invoices SET invoices.statusid=4,invoices.statusdate=Now(), invoices.assignedtoid=".$assignedtoid.", WHERE id=".$therecord["id"];
+                $querystatement = "UPDATE invoices SET invoices.statusid=4,invoices.statusdate=Now(), invoices.assignedtoid=".$assignedtoid." WHERE invoices.id=".$therecord["id"];
                 $queryresult = mysql_query($querystatement,$dblink);
                 if (!$queryresult) reportError(300,"Could not mark as invoice: ".mysql_error($dblink)." -- ".$querystatement);