dccss-commit Mailing List for DC Comprehensive Subscriber Survey

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 376
          http://dccss.svn.sourceforge.net/dccss/?rev=376&view=rev
Author:   maher_karim
Date:     2010-12-06 09:49:31 +0000 (Mon, 06 Dec 2010)

Log Message:
-----------
2010-12-06 Maher Abdel Karim <mah...@do...>

	* include/dataobject/public_billing_info.php: Modify table creation
	* doc/development/data_model.vsd: update data model
	
2010-08-17 Maher Abdel Karim <mah...@do...>

	* dataobject/public_billing_info.php: add billing info table
	class.
	* dataobject/public_subscriber.php: add more fields.
	* Query.php: adjust query page to allow query billing information
	* include/dcmmaputil.php:
	* map.php: add functionality to add meter cabinet
	* ar/LC_messages/dccss.po:
	* i18n.php: add more translation 

Modified Paths:
--------------
    branches/ms4w/apps/dccss/changelog
    branches/ms4w/apps/dccss/conf/dccss_pewssa_en.map
    branches/ms4w/apps/dccss/doc/development/data_model.vsd
    branches/ms4w/apps/dccss/include/dataobject/Public_billing_info.php
    branches/ms4w/apps/dccss/include/dataobject/Public_subscriber.php
    branches/ms4w/apps/dccss/include/i18n.php
    branches/ms4w/apps/dccss/print_ac.php
    branches/ms4w/apps/dccss/query.php

Modified: branches/ms4w/apps/dccss/changelog
===================================================================

--- branches/ms4w/apps/dccss/changelog	2010-08-17 08:40:23 UTC (rev 375)
+++ branches/ms4w/apps/dccss/changelog	2010-12-06 09:49:31 UTC (rev 376)
@@ -1,3 +1,8 @@
+2010-12-06 Maher Abdel Karim <mah...@do...>
+
+	* include/dataobject/public_billing_info.php: Modify table creation
+	* doc/development/data_model.vsd: update data model
+	
 2010-08-17 Maher Abdel Karim <mah...@do...>
 
 	* dataobject/public_billing_info.php: add billing info table

Modified: branches/ms4w/apps/dccss/conf/dccss_pewssa_en.map
===================================================================
--- branches/ms4w/apps/dccss/conf/dccss_pewssa_en.map	2010-08-17 08:40:23 UTC (rev 375)
+++ branches/ms4w/apps/dccss/conf/dccss_pewssa_en.map	2010-12-06 09:49:31 UTC (rev 376)
@@ -153,10 +153,10 @@
   LAYER  #pressurizedmain
     TRANSPARENCY 100
     NAME 'pressurizedmain'
-     STATUS off
+     STATUS default
     TOLERANCE 3
     TOLERANCEUNITS pixels
-    DATA 'C:\Program Files\dccss\dccss\data\water\pressurizedmain.shp'
+  DATA 'C:\Program Files\dccss\dccss\data\water\pressurizedmain.shp'
     HEADER 'header.html'
     FOOTER 'footer.html'
     LABELCACHE on
@@ -183,7 +183,7 @@
     
     TOLERANCE 3
     TOLERANCEUNITS pixels
-    DATA 'C:\Program Files\dccss\dccss\data\sewer\gravitymain.shp'
+     DATA 'C:\Program Files\dccss\dccss\data\sewer\gravitymain.shp'
     HEADER 'header.html'
     FOOTER 'footer.html'
     LABELCACHE on
@@ -211,14 +211,14 @@
     TOLERANCE 3
     TOLERANCEUNITS pixels
     
-  CONNECTION "dbname=dccss user=dcmms password=dcmms host=localhost"
+  CONNECTION "dbname=dccss user=dccss password=dccss host=localhost"
   data "the_geom from grid using srid=-1"
     HEADER 'header.html'
     FOOTER 'footer.html'
     LABELCACHE on
 #    TILEINDEX ''
 #    TILEITEM  ''
-    STATUS off
+    STATUS on
     DEBUG false
     TRANSFORM true
     TYPE polygon
@@ -242,16 +242,16 @@
     "RESULT_FIELDS" "id"
   END
   END  #LAYER
+
   
-
 # DeliveryPoint Layer
 LAYER
   CONNECTIONTYPE postgis
   NAME DeliveryPoint
  # maxscale 15000
   TYPE POINT
-  STATUS off
-  CONNECTION "dbname=dccss user=dcmms password=dcmms host=localhost"
+  STATUS DEFAULT
+  CONNECTION "dbname=dccss user=dccss password=dccss host=localhost"
   DATA "the_geom from DeliveryPoint using SRID=-1"
   labelitem "sequence"
   CLASS
@@ -277,7 +277,7 @@
 # Empty layer, 
 layer
   connectiontype PostGIS
-  CONNECTION "dbname=dccss user=dcmms password=dcmms host=localhost"
+  CONNECTION "dbname=dccss user=dccss password=dccss host=localhost"
   name "center"
   type POINT
   status OFF
@@ -296,6 +296,8 @@
   END
   TOLERANCE 15
 END 
+
+
 layer
   connectiontype PostGIS
   CONNECTION "dbname=dccss user=dcmms password=dcmms host=localhost"
@@ -321,8 +323,8 @@
   CONNECTION "dbname=dccss user=dcmms password=dcmms host=localhost"
   name "cabinet"
   type point
-  status Off
-  labelitem "pewssaid"
+  status default
+  labelitem "id"
   DATA "the_geom from metercabinet using unique gid"
   CLASS
     NAME "route"
@@ -332,8 +334,8 @@
         SIZE 15
         COLOR 255 0 0
         label
-    	color 38 119 38
-    	position uc
+    	color 255 0 0
+    	#position uc
 	font arial
 	type truetype
 	size 9
@@ -341,73 +343,13 @@
   END
 
 END 
-# Billing Observation Layer
-LAYER
-  CONNECTIONTYPE postgis
-  NAME Observation
- TYPE POINT
-  STATUS DEFAULT
-  CONNECTION "dbname=dccss user=dccss password=dccss host=localhost"
-  DATA "the_geom from (select the_geom,observation,evaluation,decisionmatrix,
-  meterlocation,plotting.username from DeliveryPoint right outer join plotting on 
-  deliverypoint.sequence=plotting.meterlocation where observation=1) as f 
-  using unique meterlocation using SRID=-1"
-  CLASS
-    NAME 'Observation'
-    template "ttt_query.html"
-    	SYMBOL 'O'
 
-    	SIZE 20
-	color 255 0 0
-  END
-END # Layer
-
-# Billing Observation Layer
-LAYER
-  CONNECTIONTYPE postgis
-  NAME Evaluation
- TYPE POINT
-  STATUS DEFAULT
-  CONNECTION "dbname=dccss user=dccss password=dccss host=localhost"
-  DATA "the_geom from (select the_geom,observation,evaluation,decisionmatrix,
-  meterlocation,plotting.username from DeliveryPoint right outer join plotting on 
-  deliverypoint.sequence=plotting.meterlocation where evaluation=1) as f 
-  using unique meterlocation using SRID=-1"
-  CLASS
-    NAME 'evaluation'
-    template "ttt_query.html"
-    	SYMBOL "E"
-    	SIZE 20
-	color 0 255 0
-  END
-END # Layer
-  
-# Billing Observation Layer
-LAYER
-  CONNECTIONTYPE postgis
-  NAME Decisionmatrix
- TYPE POINT
-  STATUS DEFAULT
-  CONNECTION "dbname=dccss user=dccss password=dccss host=localhost"
-  DATA "the_geom from (select the_geom,observation,evaluation,decisionmatrix,
-  meterlocation,plotting.username from DeliveryPoint right outer join plotting on 
-  deliverypoint.sequence=plotting.meterlocation where decisionmatrix=1) as f 
-  using unique meterlocation using SRID=-1"
-  CLASS
-    NAME 'DM'
-    template "ttt_query.html"
-    	SYMBOL "flag"
-    	SIZE 30
-	color 0 0 255
-  END
-END # Layer  
-
 layer
   connectiontype PostGIS
   CONNECTION "dbname=dccss user=dcmms password=dcmms host=localhost"
   name "route"
   type line
-  status Off
+  status On
   labelitem "logbookno"
   DATA "the_geom from route using unique gid"
   CLASS
@@ -435,6 +377,7 @@
 END 
 
 
+
  LAYER  #collection
     TRANSPARENCY 100
     NAME 'collection'
@@ -443,7 +386,7 @@
     TOLERANCEUNITS pixels
     CONNECTIONTYPE postgis
     CONNECTION "dbname=dccss user=dcmms password=dcmms host=localhost"
-    DATA "the_geom from collect using unique id using SRID=-1"
+    DATA "the_geom from (select the_geom,str_reverse(shape_arabic(dcmmstranslation('ar',name))) as name,id from collect) as collection using unique id using SRID=-1)"
     labelitem "name"
     HEADER 'header.html'
     FOOTER 'footer.html'
@@ -467,5 +410,66 @@
     END #CLASS
     
   END  #LAYER
+# Billing Observation Layer
+LAYER
+  CONNECTIONTYPE postgis
+  NAME Observation
+ TYPE POINT
+  STATUS DEFAULT
+  CONNECTION "dbname=dccss user=dccss password=dccss host=localhost"
+  DATA "the_geom from (select the_geom,observation,evaluation,decisionmatrix,
+  meterlocation,plotting.username from DeliveryPoint right outer join plotting on 
+  deliverypoint.sequence=plotting.meterlocation where observation=1) as f 
+  using unique meterlocation using SRID=-1"
+  CLASS
+    NAME 'Observation'
+    template "ttt_query.html"
+    	SYMBOL 'O'
+
+    	SIZE 20
+	color 255 0 0
+  END
+END # Layer
+
+# Billing Observation Layer
+LAYER
+  CONNECTIONTYPE postgis
+  NAME Evaluation
+ TYPE POINT
+  STATUS DEFAULT
+  CONNECTION "dbname=dccss user=dccss password=dccss host=localhost"
+  DATA "the_geom from (select the_geom,observation,evaluation,decisionmatrix,
+  meterlocation,plotting.username from DeliveryPoint right outer join plotting on 
+  deliverypoint.sequence=plotting.meterlocation where evaluation=1) as f 
+  using unique meterlocation using SRID=-1"
+  CLASS
+    NAME 'evaluation'
+    template "ttt_query.html"
+    	SYMBOL "E"
+    	SIZE 20
+	color 0 255 0
+  END
+END # Layer
+  
+# Billing Observation Layer
+LAYER
+  CONNECTIONTYPE postgis
+  NAME Decisionmatrix
+ TYPE POINT
+  STATUS DEFAULT
+  CONNECTION "dbname=dccss user=dccss password=dccss host=localhost"
+  DATA "the_geom from (select the_geom,observation,evaluation,decisionmatrix,
+  meterlocation,plotting.username from DeliveryPoint right outer join plotting on 
+  deliverypoint.sequence=plotting.meterlocation where decisionmatrix=1) as f 
+  using unique meterlocation using SRID=-1"
+  CLASS
+    NAME 'DM'
+    template "ttt_query.html"
+    	SYMBOL "flag"
+    	SIZE 30
+	color 0 0 255
+  END
+END # Layer  
+
 END  #MAP
 

Modified: branches/ms4w/apps/dccss/doc/development/data_model.vsd
===================================================================
(Binary files differ)

Modified: branches/ms4w/apps/dccss/include/dataobject/Public_billing_info.php
===================================================================
--- branches/ms4w/apps/dccss/include/dataobject/Public_billing_info.php	2010-08-17 08:40:23 UTC (rev 375)
+++ branches/ms4w/apps/dccss/include/dataobject/Public_billing_info.php	2010-12-06 09:49:31 UTC (rev 376)
@@ -4,18 +4,18 @@
  */
 require_once 'DB/DataObject.php';
 
-class DataObject_Public_billing_info extends DB_DataObject 
+class DataObject_Public_billing_info extends DB_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
     var $__table = 'public.billing_info';                     // table name
-    var $logbook;                         // int4(4)  
-    var $sequence;                        // int4(4)  
-    var $name;                            // varchar(-1)  
-    var $subscribernumber;                // varchar(-1)  
-    var $meternumber;                     // int4(4)  
-    var $meterlocation;                   // varchar(-1)  
+    var $logbook;                         // int4(4)
+    var $sequence;                        // int4(4)
+    var $name;                            // varchar(-1)
+    var $subscribernumber;                // varchar(-1)
+    var $meternumber;                     // int4(4)
+    var $meterlocation;                   // varchar(-1)
 
     /* ZE2 compatibility trick*/
     function __clone() { return $this;}
@@ -25,7 +25,7 @@
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
-    
+
       /**
        * Return an HTML_Table containing all available translations. The table
        * includes a link to a page for subscriber editing.
@@ -47,7 +47,7 @@
         $objTable->setCellContents(0, 5, _("Meter"), "TH");
 	$objTable->setCellContents(0, 6, _("Sequence"), "TH");
 	$objTable->setCellContents(0, 7, _("Subsequence"), "TH");
-	
+
 	 $objTable->setCellContents(0, 10, _("Action"), "TH");
 	$objTable->setCellContents(0, 8, _("Route ID"), "TH");
 $objTable->setCellContents(0, 9, _("DeliveryPoint"), "TH");
@@ -55,7 +55,7 @@
         $i = 1;
 	$showadd=true;
         while($this->fetch()) {
-          if($this->geocode != '') {
+
 	  $objTable->setCellContents($i, 0, $this->id);
 	  $objTable->setCellContents($i, 1, $this->geocode);
 	  $objTable->setCellContents($i, 2, $this->logbooknumber);
@@ -66,20 +66,22 @@
 	  $objTable->setCellContents($i, 7, $this->subsequence);
 	  $objTable->setCellContents($i, 8, $this->routeid);
 $objTable->setCellContents($i, 9, $this->dpsequence);
-
+    if($this->geocode != '') {
 	  if ($action=='view'){
 	     $ref='<a href="deliverypointpage.php?PHPSESSID='.session_id().
 	      '&action=map&geocode='.  $this->geocode.'">'.
 	      _('[View on Map]').'</a>';
 	      $ref=$ref.'<a href="print_ac.php?PHPSESSID='.session_id().
-	      '&action=map&id='.$this->id.'&geocode='.  $this->geocode.'">'.
+	       '&action=map&table='.$this->table.'&id='.$this->id.'&geocode='.  $this->geocode.'">'.
 	      _('[Print]').'</a>';
 	      $showadd=false;
 	    }
-	  $objTable->setCellContents($i, 10, $ref);  
+
+	  $objTable->setCellContents($i, 10, $ref);
 	  $i++;
 	    }
-        }
+
+}
 	if ($showadd){
         $objTable->setCellContents($i, 0,
           "<a href=\"subscriberpage.php?geocode=".$this->geocode.
@@ -87,5 +89,5 @@
 	}
         return $objTable;
   }
-  
+
  }

Modified: branches/ms4w/apps/dccss/include/dataobject/Public_subscriber.php
===================================================================
--- branches/ms4w/apps/dccss/include/dataobject/Public_subscriber.php	2010-08-17 08:40:23 UTC (rev 375)
+++ branches/ms4w/apps/dccss/include/dataobject/Public_subscriber.php	2010-12-06 09:49:31 UTC (rev 376)
@@ -230,7 +230,7 @@
 	      '&action=map&geocode='.  $this->geocode.'">'.
 	      _('[View on Map]').'</a>';
 	      $ref=$ref.'<a href="print_ac.php?PHPSESSID='.session_id().
-	      '&action=map&id='.$this->id.'&geocode='.  $this->geocode.'">'.
+	      '&action=map&table='.$this->table.'&id='.$this->id.'&geocode='.  $this->geocode.'">'.
 	      _('[Print]').'</a>';
 	      $showadd=false;
 	    }

Modified: branches/ms4w/apps/dccss/include/i18n.php
===================================================================
--- branches/ms4w/apps/dccss/include/i18n.php	2010-08-17 08:40:23 UTC (rev 375)
+++ branches/ms4w/apps/dccss/include/i18n.php	2010-12-06 09:49:31 UTC (rev 376)
@@ -145,7 +145,7 @@
 _("pewssaid");
 _('Route ID');
 _('DeliveryPoint');
-
+_('sequence');
 ?>
 
 

Modified: branches/ms4w/apps/dccss/print_ac.php
===================================================================
--- branches/ms4w/apps/dccss/print_ac.php	2010-08-17 08:40:23 UTC (rev 375)
+++ branches/ms4w/apps/dccss/print_ac.php	2010-12-06 09:49:31 UTC (rev 376)
@@ -75,6 +75,8 @@
 	<tr><td><font size=\"2\"><?= _("Geographic location for new customer neigboor") ?></td></tr>
 <?php
 if ($_REQUEST['action']=='map'){
+
+if ($_REQUEST['table']=='subscriber'){
   $query = "select css_to_billing.customerlocation,css_to_billing.meterlocation,
   	metercabinet.pewssaid,css_to_billing.paracode,css_to_billing.logbooknumber,
 	css_to_billing.sequence,css_to_billing.subsequence
@@ -83,7 +85,23 @@
 	  (css_to_billing.customerlocation=deliverypoint.sequence) left outer 
 	  join metercabinet 
 	  on (css_to_billing.meterlocation=metercabinet.id) 
-	  where deliverypoint.geocode=".$_REQUEST['geocode']." and css_to_billing.id=".$_REQUEST['id'];
+	  where deliverypoint.geocode='".$_REQUEST['geocode']."' and css_to_billing.id=".$_REQUEST['id'];
+} elseif ($_REQUEST['table']=='billing_info'){
+  $query = "select billing_info.customerlocation,billing_info.meterlocation,
+  	metercabinet.pewssaid,billing_info.pnr as paracode,billing_info.book as logbooknumber,
+	billing_info.tr as Sequence ,billing_info.book_1 as subsequence
+	  ,billing_info.full_name as name,deliverypoint.routeid from billing_info 
+	  left outer join deliverypoint on 
+	  (billing_info.customerlocation=deliverypoint.sequence) left outer 
+	  join metercabinet 
+	  on (billing_info.meterlocation=metercabinet.id) 
+	  where deliverypoint.geocode='".$_REQUEST['geocode']."' and billing_info.pnr='".$_REQUEST['id']."'";
+
+
+
+}
+
+
     //echo ($query);
     $result = pg_query($query);
     $numfields = pg_numfields($result);
@@ -163,8 +181,8 @@
 	    adjustScalebar($map);
 if ($_REQUEST['action']=='map'){
       $objLayer = $map->getlayerbyname('DeliveryPoint');
-      $query = "select X(the_geom),Y(the_geom) from deliverypoint where geocode=".
-                $_REQUEST['geocode'];
+      $query = "select X(the_geom),Y(the_geom) from deliverypoint where geocode='".
+                $_REQUEST['geocode']."'";
 	      $resultextent = pg_query($query);
               $numrows = pg_numrows($resultextent);
 

Modified: branches/ms4w/apps/dccss/query.php
===================================================================
--- branches/ms4w/apps/dccss/query.php	2010-08-17 08:40:23 UTC (rev 375)
+++ branches/ms4w/apps/dccss/query.php	2010-12-06 09:49:31 UTC (rev 376)
@@ -58,11 +58,11 @@
 
 //print_r($_POST);
 
-$objArea =&$Queryform->addElement('hierselect', 'area', _('Area:'), 
+$objArea =&$Queryform->addElement('hierselect', 'area', _('Area:'),
   array('title' => _('Narrow down the area in which to search for points of interest.')));
 $strQuery = 'select dcmmstranslation(\''.$_SESSION['language'].
-  '\',Name), CodedValue from AdministrativeArea';    
-  
+  '\',Name), CodedValue from AdministrativeArea';
+
 $arrAdministrativeArea[0] = _('[Select One]');
 $objResult =pg_query($strQuery);
 
@@ -71,7 +71,7 @@
 }
 
 $strQuery = 'select dcmmstranslation(\''.$_SESSION['language'].
-  '\',Name), Administra, CodedValue from Village where codedvalue in 
+  '\',Name), Administra, CodedValue from Village where codedvalue in
   (select village from landmark) order by Administra';
 $arrVillage[0][0] = _('[Select One]');
 $objResult =pg_query($strQuery);
@@ -95,7 +95,7 @@
     $arrlandmark[$arrRow[1]][0][0] = _('[Select One]');
   }
   $arrlandmark[$arrRow[1]][$arrRow[2]][$arrRow[0]] = $arrRow[0];
-  
+
 }
 
 
@@ -122,8 +122,8 @@
     $strQuery="select logbook,sequence,subsequence,name,subscribernumber,
     meternumber from ".$Queryform->exportValue('Table')." where ";
       if (($Queryform->exportValue('query')==1)){
-	
-	$strWhere="chr(meternumber)='".$Queryform->exportValue('searchvalue')."'"; 
+
+	$strWhere="chr(meternumber)='".$Queryform->exportValue('searchvalue')."'";
       } elseif ($Queryform->exportValue('query')==2){
 	$strWhere="subscribernumber='".$Queryform->exportValue('searchvalue')."'";
       } elseif ($Queryform->exportValue('query')==3){
@@ -139,10 +139,10 @@
 
 $strQuery="select deliverypoint.sequence as dpsequence ,billing_info.tr as sequence,billing_info.book as logbooknumber,billing_info.full_name as name,
 billing_info.pnr as id, deliverypoint.geocode,billing_info.num as serialnumber,billing_info.account_nu as subscription,billing_info.book_1 as subsequence,
-deliverypoint.routeid  from billing_info  left outer join deliverypoint on (billing_info.customerlocation=deliverypoint.sequence) left outer join metercabinet on 
+deliverypoint.routeid,'billing_info' as table   from billing_info  left outer join deliverypoint on (billing_info.customerlocation=deliverypoint.sequence) left outer join metercabinet on
 (billing_info.meterlocation=metercabinet.id)  ";
     if ($Queryform->exportValue('query')==1){
-      $strWhere=$strWhere." and num='".$Queryform->exportValue('searchvalue')."'"; 
+      $strWhere=$strWhere." and num='".$Queryform->exportValue('searchvalue')."'";
     } elseif ($Queryform->exportValue('query')==2){
       $strWhere=$strWhere." and account_nu='".$Queryform->exportValue('searchvalue')."'";
     } elseif ($Queryform->exportValue('query')==3){
@@ -160,17 +160,17 @@
 
 //print_r($strQuery.$strWhere);
 
-     
+
   }else{
-	
+
    // $tablename='public.'.$Queryform->exportValue('Table');
    $tablename='public.subscriber';
     $strQuery="select deliverypoint.sequence as dpsequence ,subscriber.sequence as sequence,subscriber.logbooknumber,subscriber.name,subscriber.id,
-    subscriber.geocode,subscriber.serialnumber,subscriber.subscription,subscriber.subsequence,deliverypoint.routeid 
-    from deliverypoint left outer join metercabinet on (metercabinet.pewssaid=deliverypoint.cabinetid)  left outer join subscriber on ( 
+    subscriber.geocode,subscriber.serialnumber,subscriber.subscription,subscriber.subsequence,deliverypoint.routeid,'subscriber' as table
+    from deliverypoint left outer join metercabinet on (metercabinet.pewssaid=deliverypoint.cabinetid)  left outer join subscriber on (
     subscriber.geocode=deliverypoint.geocode) ";
     if ($Queryform->exportValue('query')==1){
-      $strWhere=" and serialnumber='".$Queryform->exportValue('searchvalue')."'"; 
+      $strWhere=" and serialnumber='".$Queryform->exportValue('searchvalue')."'";
     } elseif ($Queryform->exportValue('query')==2){
       $strWhere=" and subscription='".$Queryform->exportValue('searchvalue')."'";
     } elseif ($Queryform->exportValue('query')==3){
@@ -186,12 +186,12 @@
 	$strWhere=" and paracode='".$Queryform->exportValue('searchvalue')."'";
     }
   }
-  
+
   $objTable = DB_DataObject::factory($tablename);
   if(PEAR::isError($objTable)or(NULL == $objTable)) {
     die(_($objTable->getMessage()));
   }
-  
+
   $Queryform->process($Queryform, false);
   //$objSubscriber->orderBy('sequence,subsequence');
 
@@ -200,7 +200,7 @@
     $result = pg_query($strQuery.$strWhere);
     $numrows = pg_numrows($result);
     $objTable->Query($strQuery.$strWhere);
-    
+
     if (($numrows > 0)){
     $objSubscriberTable = $objTable->getTable('<a href="'.
     basename(__FILE__).'?PHPSESSID='.session_id().'&geocode=1">'.
@@ -208,7 +208,7 @@
      $DccssPage->add($objSubscriberTable->tohtml());
     }
   }elseif (($_POST['area'][1]!='0')&&($Queryform->exportValue('searchvalue')=='')){
-	   
+
 	  $strQuery = "select dcmmstranslation('".$_SESSION['language'].
   "',landmark.Name), dcmmstranslation('".$_SESSION['language'].
   "',administrativearea.name), dcmmstranslation('".$_SESSION['language'].
@@ -221,7 +221,7 @@
 	$result = pg_query($strQuery);
     $numrows = pg_numrows($result);
     $objTable->Query($strQuery);
-    
+
  $objTable = new DbTable($DccssPage->postgis->db, $strQuery);
   $objTable->addRows();
   $numRowCount = $objTable->getRowCount();
@@ -235,17 +235,17 @@
 
      // for ($i==0;$i<$numRowCount;$i++){
 	//      $arrRow =& pg_fetch_row($result);
-	       
+
 	          $ref='<a href="deliverypointpage.php?PHPSESSID='.session_id().
 	      '&action=mapLandmark&gid='.$arrRow[3].'&name='.$arrRow[0].'&village='.$arrRow[2].'">'.
 	      _('[View on Map]').'</a>';
      $objTable->setCellContents($i, 3,  $ref. '<a href="print_ac.php?PHPSESSID='.session_id().
 	      '&action=mapLandmark&gid='.$arrRow[3].'&name='.$arrRow[0].'&village='.$arrRow[2].'">'.
 	      _('[Print]').'</a>');
-    $i++;  
+    $i++;
     }
   }
-  
+
 $DccssPage->add($objTable->toHtml());
 
   }elseif (($Queryform->exportValue('query')==0)&&($Queryform->exportValue('searchvalue')!='')){
@@ -255,7 +255,7 @@
   "',administrativearea.name), dcmmstranslation('".$_SESSION['language'].
   "',village.name),landmark.gid from landmark
 left outer join administrativearea on (landmark.administra=administrativearea.codedvalue)
-left outer join village on (landmark.village=village.codedvalue)  
+left outer join village on (landmark.village=village.codedvalue)
 where dcmmstranslation('".$_SESSION['language'].
   "',landmark.Name) like '%".$Queryform->exportValue('searchvalue')."%' order by gid asc";
 //print_r($strQuery);
@@ -263,7 +263,7 @@
 	$result = pg_query($strQuery);
     $numrows = pg_numrows($result);
     $objTable->Query($strQuery);
-    
+
  $objTable = new DbTable($DccssPage->postgis->db, $strQuery);
   $objTable->addRows();
   $numRowCount = $objTable->getRowCount();
@@ -277,19 +277,19 @@
 
      // for ($i==0;$i<$numRowCount;$i++){
 	//      $arrRow =& pg_fetch_row($result);
-	       
+
 	          $ref='<a href="deliverypointpage.php?PHPSESSID='.session_id().
 	      '&action=mapLandmark&gid='.$arrRow[3].'&name='.$arrRow[0].'&village='.$arrRow[2].'">'.
 	      _('[View on Map]').'</a>';
      $objTable->setCellContents($i, 3,  $ref. '<a href="print_ac.php?PHPSESSID='.session_id().
 	      '&action=mapLandmark&gid='.$arrRow[3].'&name='.$arrRow[0].'&village='.$arrRow[2].'">'.
 	      _('[Print]').'</a>');
-    $i++;  
+    $i++;
     }
   }
-  
+
 $DccssPage->add($objTable->toHtml());
-  
+
   }
 }
 


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




2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (63)	Oct (176)	Nov (98)	Dec (29)
2006	Jan (37)	Feb (12)	Mar (9)	Apr (20)	May (1)	Jun (20)	Jul (11)	Aug	Sep	Oct (5)	Nov (7)	Dec (2)
2007	Jan (8)	Feb	Mar (7)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (10)
2009	Jan (5)	Feb (2)	Mar	Apr	May	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec
2010	Jan	Feb	Mar	Apr	May (1)	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec (1)

dccss-commit Mailing List for DC Comprehensive Subscriber Survey

dccss-commit — DCCSS commit messages