Added new Admin page with a data import tool.

diff --git a/import_ward_data b/import_ward_data
index da23ae4ed07291314712423e04d0b63c31301fac..c04da9f10beb2f9a7a45d9eae9f902f3bfe693e5 100755 (executable)
--- a/import_ward_data
+++ b/import_ward_data
@@ -82,7 +82,7 @@ sub print_hash
 #+-------+--------------------+------+-----+---------+-------+
 sub update_eq_aaronic_table
 {
 #+-------+--------------------+------+-----+---------+-------+
 sub update_eq_aaronic_table
 {

-    print "-> Updating eq_aaronic table\n";
+    print "\n-> Updating eq_aaronic table\n";

 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_aaronic set valid=0");
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_aaronic set valid=0");


@@ -138,7 +138,7 @@ sub update_eq_aaronic_table
 #+------------+------------------+------+-----+---------+-------+
 sub update_eq_elder_table
 {
 #+------------+------------------+------+-----+---------+-------+
 sub update_eq_elder_table
 {

-    print "-> Updating eq_elder table\n";
+    print "\n-> Updating eq_elder table\n";

 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_elder set valid=0");
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_elder set valid=0");


@@ -197,7 +197,7 @@ sub update_eq_elder_table
 #+--------------+------------------+------+-----+---------+-------+
 sub update_eq_calling_table()
 {
 #+--------------+------------------+------+-----+---------+-------+
 sub update_eq_calling_table()
 {

-    print "-> Updating eq_calling table\n";
+    print "\n-> Updating eq_calling table\n";

 
     #print "-> Organization Data Dump\n\n";
     #&print_hash(\%organization_data);
 
     #print "-> Organization Data Dump\n\n";
     #&print_hash(\%organization_data);


@@ -237,7 +237,7 @@ sub update_eq_district_table
 {
     # Districts should be created by hand. This subroutine only
     # updates the supervisor's ID in each district.
 {
     # Districts should be created by hand. This subroutine only
     # updates the supervisor's ID in each district.

-    print "-> Updating eq_district table\n";
+    print "\n-> Updating eq_district table\n";

     $sth = $dbh->prepare("select * from eq_district");
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     while($sqlhashref = $sth->fetchrow_hashref) {
     $sth = $dbh->prepare("select * from eq_district");
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     while($sqlhashref = $sth->fetchrow_hashref) {


@@ -267,7 +267,7 @@ sub update_eq_district_table
 #+---------------+------------------+------+-----+---------+-------+
 sub update_eq_companionship_table
 {
 #+---------------+------------------+------+-----+---------+-------+
 sub update_eq_companionship_table
 {

-    print "-> Updating eq_companionship table\n";
+    print "\n-> Updating eq_companionship table\n";

 
     # First, mark all existing companionships as invalid in case they have been dissolved
     $sth = $dbh->prepare("update eq_companionship set valid=0");
 
     # First, mark all existing companionships as invalid in case they have been dissolved
     $sth = $dbh->prepare("update eq_companionship set valid=0");


@@ -354,7 +354,7 @@ sub update_eq_companionship_table
 #+---------------+------------------+------+-----+---------+-------+
 sub update_eq_family_table
 {
 #+---------------+------------------+------+-----+---------+-------+
 sub update_eq_family_table
 {

-    print "-> Updating eq_family table\n";
+    print "\n-> Updating eq_family table\n";

 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_family set valid=0");
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_family set valid=0");


@@ -441,7 +441,7 @@ sub update_eq_family_table
 #+----------+------------------+------+-----+---------+-------+
 sub update_eq_parent_table
 {
 #+----------+------------------+------+-----+---------+-------+
 sub update_eq_parent_table
 {

-    print "-> Updating eq_parent table\n";
+    print "\n-> Updating eq_parent table\n";

 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_parent set valid=0");
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_parent set valid=0");


@@ -526,7 +526,7 @@ sub update_eq_parent_table
 #+----------+------------------+------+-----+---------+-------+
 sub update_eq_child_table
 {
 #+----------+------------------+------+-----+---------+-------+
 sub update_eq_child_table
 {

-    print "-> Updating eq_child table\n";
+    print "\n-> Updating eq_child table\n";

 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_child set valid=0");
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_child set valid=0");


@@ -656,7 +656,7 @@ if(defined $opt_o) {
 # Process command line options
 if(defined $opt_n) { $datadir = $opt_n; }
 else { $datadir = shift(@ARGV); }
 # Process command line options
 if(defined $opt_n) { $datadir = $opt_n; }
 else { $datadir = shift(@ARGV); }

-print "-> Processing all ward data files in $datadir\n";
+print "\n-> Processing all ward data files in $datadir\n";

 
 ###################################################
 # Parse Ward Data Files
 
 ###################################################
 # Parse Ward Data Files

diff --git a/inc/class.eq.inc.php b/inc/class.eq.inc.php
index b1dbb23a16972777e4cf215dba8e16f1032f7eb0..d6bf500688d66b88a3a558d35284e0b65ff62fea 100644 (file)
--- a/inc/class.eq.inc.php
+++ b/inc/class.eq.inc.php
@@ -25,6 +25,8 @@ class eq
   var $default_att_num_months;
   var $current_year;
   var $current_month;
   var $default_att_num_months;
   var $current_year;
   var $current_month;

+  var $upload_target_path;
+  var $script_path;

   
   var $public_functions = array
     (
   
   var $public_functions = array
     (


@@ -41,7 +43,8 @@ class eq
      'att_view'   => True,
      'att_update' => True,
      'dir_view'   => True,
      'att_view'   => True,
      'att_update' => True,
      'dir_view'   => True,

-     'org_view'   => True
+     'org_view'   => True,
+     'admin'      => True

      );
  
   function eq()
      );
  
   function eq()


@@ -50,6 +53,8 @@ class eq
       $this->default_ppi_num_months = 3;
       $this->default_ppi_num_years = 0;
       $this->default_att_num_months = 3;
       $this->default_ppi_num_months = 3;
       $this->default_ppi_num_years = 0;
       $this->default_att_num_months = 3;

+      $this->upload_target_path = "/home/users/eqpres/eq_data/";
+      $this->script_path = "/usr/share/phpgroupware/eq/";

       
       $this->db                = $GLOBALS['phpgw']->db;
       $this->db2       = $this->db;
       
       $this->db                = $GLOBALS['phpgw']->db;
       $this->db2       = $this->db;


@@ -121,6 +126,9 @@ class eq
       $link_data['menuaction'] = 'eq.eq.org_view';     
       $this->t->set_var('link_org',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
       $this->t->set_var('lang_org','Callings');
       $link_data['menuaction'] = 'eq.eq.org_view';     
       $this->t->set_var('link_org',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
       $this->t->set_var('lang_org','Callings');

+      $link_data['menuaction'] = 'eq.eq.admin';        
+      $this->t->set_var('link_admin',$GLOBALS['phpgw']->link('/eq/index.php',$link_data));
+      $this->t->set_var('lang_admin','Admin');

                
       $this->t->pparse('out','eq_header');
     }
                
       $this->t->pparse('out','eq_header');
     }


@@ -1851,6 +1859,123 @@ class eq
       $this->t->pfp('out','org_view_t');
       $this->save_sessiondata();   
     }
       $this->t->pfp('out','org_view_t');
       $this->save_sessiondata();   
     }

+
+  function admin()
+    {
+      $this->t->set_file(array('admin_t' => 'admin.tpl'));
+      $this->t->set_block('admin_t','upload','uploadhandle');
+      $this->t->set_block('admin_t','admin','adminhandle');
+      $this->t->set_block('admin_t','cmd','cmdhandle');
+      
+      $this->t->set_var('upload_action',$GLOBALS['phpgw']->link('/eq/index.php','menuaction=eq.eq.admin&action=upload'));
+      
+      $action = get_var('action',array('GET','POST'));
+
+      $this->t->pfp('out','admin_t');
+      
+      if($action == 'upload')
+       {        
+         $target_path = $this->upload_target_path . basename( $_FILES['uploadedfile']['name']);
+         
+         if(($_FILES['uploadedfile']['type'] == "application/zip") &&
+            (move_uploaded_file($_FILES['uploadedfile']['tmp_name'], $target_path))) {
+           $uploadstatus = "<b>The following file was uploaded successfully: </b><br><br>";
+           $uploadstatus.= "Filename : " . $_FILES['uploadedfile']['name'] . "<br>";
+           $uploadstatus.= "Type     : " . $_FILES['uploadedfile']['type'] . "<br>";
+           $uploadstatus.= "Size     : " . $_FILES['uploadedfile']['size'] . "<br>";    
+           $this->t->set_var('uploadstatus',$uploadstatus);
+           $this->t->pfp('uploadhandle','upload');
+           $this->t->set_var('uploadhandle','');
+           print "<table border=1 width=80%><tr><td>\n<pre>";
+           
+           # make a directory for this data to be stored in
+           $date="data_" . date("Y_m_d");
+           $data_dir = $this->upload_target_path . $date;
+           print "-> Making the data directory: $date<br>\n";
+           exec('mkdir ' . $data_dir . ' 2>&1', $result, $return_code);
+           if($return_code != 0) {
+             print implode('\n',$result) . "<br>";
+             print "<b><font color=red>";
+             print "-E- Unable to create the data directory. Aborting import.";
+             print "</font></b>";
+             return 0;
+           }
+
+           # move the file uploaded into this directory
+           print "-> Moving the uploaded file into the data dir<br>\n";
+           exec('mv ' . $target_path . ' ' . $data_dir . '/' . ' 2>&1', $result, $return_code);
+           if($return_code != 0) {
+             print implode('\n',$result) . "<br>";
+             print "<b><font color=red>";
+             print "-E- Unable to move the uploaded file into the data dir. Aborting import.";
+             print "</font></b>";
+             return 0;
+           }
+           
+           # unzip the data into this directory
+           print "-> Unzipping the data<br>\n";
+           $data_file = $data_dir . '';
+           exec('unzip ' . $data_dir . '/*.zip -d ' . $data_dir . ' 2>&1', $result, $return_code);
+           if($return_code != 0) {
+             print implode('\n',$result) . "<br>";
+             print "<b><font color=red>";
+             print "-E- Unable to unzip the uploaded file into the data dir. Aborting import.";
+             print "</font></b>";
+             return 0;
+           }
+           exec('mv ' . $data_dir . '/*/* '. $data_dir . ' 2>&1', $result, $return_code);
+
+           # update the data_latest link to point to this new directory
+           print "-> Updating the latest data dir link<br>\n";
+           $data_latest = $this->upload_target_path . 'data_latest';
+           exec('rm ' . $data_latest. '; ln -s ' . $data_dir .' '. $data_latest .' 2>&1', $result, $return_code);
+           if($return_code != 0) {
+             print implode('\n',$result) . "<br>";
+             print "<b><font color=red>";
+             print "-E- Unable to update the data latest link. Aborting import.";
+             print "</font></b>";
+             return 0;
+           }
+           
+           # run the import perl script to encorporate it into the DB
+           ob_start('ob_logstdout', 2);
+           print "-> Importing the data into the EQ database<br>\n";
+           ob_flush(); flush(); sleep(1);
+           $import_log = $this->upload_target_path . '/import.log';
+           $data_log = $this->upload_target_path . '/data.log';
+           $import_cmd = $this->script_path . 'import_ward_data ' . $data_latest . ' | tee ' . $import_log;
+           $parse_cmd = $this->script_path . 'parse_ward_data -v ' . $data_latest . ' > ' . $data_log;
+           #print "import_cmd: $import_cmd<br>";
+           #print "parse_cmd: $parse_cmd<br>";
+           ob_start('ob_logstdout', 2);
+           passthru($import_cmd);
+           passthru($parse_cmd);
+           ob_flush(); flush(); sleep(1);
+
+           # fix the permissions of the data dir
+           exec('chmod -R o-rwx ' . $data_dir, $result, $return_code);
+           
+           $this->t->pfp('cmdhandle','cmd');
+           print "</pre></td></tr></table>";
+           
+         } else if($_FILES['uploadedfile']['type'] != "application/zip") {
+           $uploadstatus = "<b><font color=red>The file format must be a .zip file, please try again! </font></b>";
+           $this->t->set_var('uploadstatus',$uploadstatus);
+           
+         } else {
+           $uploadstatus = "<b><font color=red> There was an error (" . $_FILES['uploadedfile']['error'];
+           $uploadstatus.= ") uploading the file, please try again! </font></b>";
+           $this->t->set_var('uploadstatus',$uploadstatus);
+         }
+       }
+      else
+       {
+         $this->t->set_var('adminhandle','');
+         $this->t->pfp('adminhandle','admin'); 
+       }
+      
+      $this->save_sessiondata();   
+    }

   
 }
 
   
 }
 

diff --git a/templates/default/admin.tpl b/templates/default/admin.tpl
new file mode 100644 (file)
index 0000000..d2a87ba
--- /dev/null
+++ b/templates/default/admin.tpl
@@ -0,0 +1,51 @@
+<!-- BEGIN admin_t -->
+       <center>
+       <table border="0" width="80%" cellspacing="2" cellpadding="2">
+       <tr>
+         <td align="center" bgcolor="#c9c9c9"><font face="{font}"><b>Administrator Tools</b></font></td>
+       </tr>
+       </table>
+       <br>
+<!-- END admin_t -->
+
+<!-- BEGIN admin -->
+       <center>
+        <table border="0" width="80%" cellspacing="2" cellpadding="2">
+       <tr>
+          <td align="left">
+           <hr>
+           <b>Update our MLS database snapshot</b>
+           <br><br>
+           <form enctype="multipart/form-data" action="{upload_action}" method="POST">
+           <input type="hidden" name="MAX_FILE_SIZE" value="500000">
+           Choose the MLS data file to upload (.zip): <input name="uploadedfile" type="file" size=40><br>
+            <br>
+           <input type="submit" value="Import Data File"> &nbsp; (Import can take up to 30 seconds)
+           </form>
+            <hr>
+         </td>
+        </tr>
+        </table>
+<!-- END admin -->
+
+<!-- BEGIN upload -->
+       <center>
+        <table border="0" width="80%" cellspacing="2" cellpadding="2">
+       <tr>
+          <td align="left">
+           <hr>
+           {uploadstatus}
+           <hr>
+         </td>
+       </tr>
+       </table>
+<!-- END upload -->
+
+<!-- BEGIN cmd -->
+
+<!-- END cmd -->
+
+</center>
+
+
+

diff --git a/templates/default/header.tpl b/templates/default/header.tpl
index 6ccfdeaa0c0a84ea342aea700ffcab877e29c7b8..3e109a4042fa5a22e3b393475356f7ff36c80128 100644 (file)
--- a/templates/default/header.tpl
+++ b/templates/default/header.tpl
@@ -2,7 +2,7 @@
 
 <p>
        <center>
 
 <p>
        <center>

-               <table border="0" width=70% cellpadding="2" cellspacing="2">
+               <table border="0" width=80% cellpadding="2" cellspacing="2">

                        <tr>
                                <td width=100% align="center" bgcolor="{bg_color}"><font face="{font}"><b>
                                        <a href="{link_hometeaching}">{lang_hometeaching}</a>
                        <tr>
                                <td width=100% align="center" bgcolor="{bg_color}"><font face="{font}"><b>
                                        <a href="{link_hometeaching}">{lang_hometeaching}</a>


@@ -27,6 +27,9 @@
                                        &nbsp;
                                         &nbsp;
                                         <a href="{link_org}">{lang_org}</a>
                                        &nbsp;
                                         &nbsp;
                                         <a href="{link_org}">{lang_org}</a>

+                                       &nbsp;
+                                        &nbsp;
+                                        <a href="{link_admin}">{lang_admin}</a>

                                        </b></font></td>
 
                        </tr>
                                        </b></font></td>
 
                        </tr>