[Dccss-commit] SF.net SVN: dccss:[372] branches/ms4w/apps/dccss

[<mah...@us...>]

Revision: 372
          http://dccss.svn.sourceforge.net/dccss/?rev=372&view=rev
Author:   maher_karim
Date:     2009-02-12 10:01:21 +0000 (Thu, 12 Feb 2009)

Log Message:
-----------
2009-02-12  Maher Abdel karim <mah...@do...>

	* admin/processing.php: Update the processing code to allow string for
	cabinet id.
	

Modified Paths:
--------------
    branches/ms4w/apps/dccss/admin/processing.php
    branches/ms4w/apps/dccss/changelog

Modified: branches/ms4w/apps/dccss/admin/processing.php
===================================================================
--- branches/ms4w/apps/dccss/admin/processing.php	2009-02-11 16:16:31 UTC (rev 371)
+++ branches/ms4w/apps/dccss/admin/processing.php	2009-02-12 10:01:21 UTC (rev 372)
@@ -30,7 +30,7 @@
 
 $DccssPage->add( _("Process data in dccss database.")."<br>");
 $DccssPage->add (_("Please Select the processing type from the list."));
-$processArray= array ("dcrmroute" => _("Generate route information"),
+$processArray= array ("Select One"=>_("Select One"),"dcrmroute" => _("Generate route information"),
 "createlineconnection"=>_("Create line connection between meter cabinet and deliverypoints"));
 
 $Processingform = new HTML_QuickForm('Processingform');
@@ -40,9 +40,9 @@
 $Processingform->addElement('submit', null, _('Process GIS data'));
 $Processingform->addRule('processingvalue',
   _('Please enter the value to be processed.'), 'required', null, 'client');
-  $Processingform->addRule('processingvalue',
-  _('Please enter the processing value or enter 0 to process all data.'),
-  'numeric', null, 'client');
+ // $Processingform->addRule('processingvalue',
+ // _('Please enter the processing value or enter 0 to process all data.'),
+ // 'numeric', null, 'client');
 $Processingform->setRequiredNote('<span style="font-size:80%; color:#ff0000;"
   >*</span><span style="font-size:80%;"> '.
   _('denotes required field').'</span>');
@@ -62,7 +62,12 @@
   $strQuery=$strQuery."'".$Processingform->exportValue('processingvalue')."')";
 }
 }else{
+	if (is_numeric($Processingform->exportValue('processingvalue'))){
   $strQuery=$strQuery.$Processingform->exportValue('processingvalue').")";
+	} else{
+		$DccssPage->add(_("The logbook should be number, You passed text"));
+		$strQuery="Select 1";
+	}
 }
 
       $objResult = pg_query($strQuery);

Modified: branches/ms4w/apps/dccss/changelog
===================================================================
--- branches/ms4w/apps/dccss/changelog	2009-02-11 16:16:31 UTC (rev 371)
+++ branches/ms4w/apps/dccss/changelog	2009-02-12 10:01:21 UTC (rev 372)
@@ -1,3 +1,8 @@
+2009-02-12  Maher Abdel karim <mah...@do...>
+
+	* admin/processing.php: Update the processing code to allow string for
+	cabinet id.
+	
 2009-02-11  Maher Abdel karim <mah...@do...>
 
 	* print_ac.php: Handle deliverypoints with many subscribers


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.