Changeset 712192

Timestamp:

05/13/2013 05:20:54 AM (13 years ago)

Author:

Sanskript

Message:

Fixed issue with post_date now using moddate
Improvements to settings page.

Location:

soldpress/branches/0.9.5A

Files:

• adapter.php (modified) (10 diffs)
• settings.php (modified) (7 diffs)
• soldpress.php (modified) (1 diff)

soldpress/branches/0.9.5A/adapter.php

@@ -105 +105 @@
     }
     
-    public function sync_residentialproperty($crit, $culture)
-    {   
+    public function sync_residentialproperty($crit)
+    {   
+
         $this->WriteLog('Sync Start');
         global $wpdb;
@@ -112 +113 @@
         $syncenabled = get_option("sc-sync-enabled",true);
         if($syncenabled != true){
-                $this->WriteLog('Sync Disabled');
-                return;
-        }
-        
-        //Get Time
-        //Get Culture
-    
+            $this->WriteLog('Sync Disabled');
+            return;
+        }
+        
         update_option( 'sc-status', true );
-        update_option( 'sc-sync-start',time() ); 
-        update_option( 'sc-sync-end','' ); 
-
-        if($culture =='')
-        {
-            $culture = "en-CA";
-        }
+        update_option( 'sc-soldpress_listing_sync-start',time() ); 
+        update_option( 'sc-soldpress_listing_sync-end','' ); 
+    
+        $culture = get_option("sc-language","en-CA");
 
         $this->WriteLog('service->Search' . $crit);
@@ -133 +128 @@
         $properties = $this->service->Search("Property","Property",$crit,array("Limit" => '100',"Culture" => $culture));    
         $this->WriteLog('Retrieved Results');
-
+        $total = count($properties);
+        $this->WriteLog("Retrieved Results Total" .$total );
+        
         //Get Disconnect Array of Current Posts
         $posts_array = $wpdb->get_results("select ID,post_name from $wpdb->posts where post_type = 'sp_property'");
+        
         //Reset Data
-        $total = count($properties);
         $count = 0;
         $user_id = get_current_user_id();
@@ -143 +140 @@
         foreach ($properties as &$rets) {
             
-            if($this->loginURL == http://sample.data.crea.ca/Login.svc/Login){
+            //If sample data set we are only going to insert Vancouver Listing.
+        
+            if($this->loginURL == "http://sample.data.crea.ca/Login.svc/Login"){
                 if($rets['City'] != "Vancouver"){
-                    return;
+                    continue;
                 }
             }
@@ -161 +160 @@
             }
     
+            $postdate  = DateTime::createFromFormat("d/m/Y H:i:s A", $rets['ModificationTimestamp']);   
+            $this->WriteLog($postdate->format('Y-m-d') . " " . $postdate->getTimestamp());
+//it's false if an error occurs) but you should also definitely check DateTime::getLastErrors();
             $title = $rets['UnparsedAddress'] .' (' . $rets['ListingId'] .')';
             $content = "";
@@ -170 +172 @@
                     $post->post_content  = "";
                     $post->post_name = $ListingKey;
-                    $post->post_date = $rets['ModificationTimestamp'];
+                    $post->post_date = $postdate->format('Y-m-d H:i:s');
 
                     wp_update_post($post);
@@ -203 +205 @@
                       'post_type'   => 'sp_property',
                       'post_name' => $ListingKey,
-                      'post_date' => $rets['ModificationTimestamp'] 
+                      'post_date' => $postdate->format('Y-m-d H:i:s')
                 );
             
-                $post_id = wp_insert_post( $post, $wp_error);
-
-                if($post_id == 0){
-                    $this->WriteLog('Insert Post' . $ListingKey . '-' . $post_id . ' Record -' .$count . ' of ' . $total . "Error:" . $wp_error . 'User:' . $user_id);  
-                    //$this->WriteLog($wpdb->last_error);               
+                $post_id = wp_insert_post( $post, true);
+
+                if (is_wp_error($post_id)) {
+                        $this->WriteLog(' Insert Post - Error' . $ListingKey . '-' . $post_id . ' Record -' .$count . ' of '. 'User:' . $user_id);
+                        $errors = $post_id->get_error_messages();
+                        foreach ($errors as $error) {
+                            $this->WriteLog( var_dump($error)); 
+                        }
                 }
                 else
                 {
-
                     $this->WriteLog('Insert Post' . $ListingKey . '-' . $post_id . ' Record -' .$count . ' of ' . $total);  
                                     
@@ -232 +236 @@
         $this->WriteLog('End Sync');        
         
-        update_option( 'sc-sync-end',time() ); 
+        update_option( 'sc-soldpress_listing_sync-end',time() ); 
         update_option( 'sc-status', false ); 
         
@@ -240 +244 @@
     public function sync_pictures()
     {
+        
         global $wpdb;
         $wpdb->query("set wait_timeout = 1200");
         $this->WriteLog('Begin Picture Sync');  
+        
+        update_option( 'sc-soldpress_photo_sync-start-status', true ); 
+        update_option( 'sc-soldpress_photo_sync-start',time() );
+        update_option( 'sc-soldpress_photo_sync-end','' );
         //TODO:// we should be able to speed this up by only joining to the key
         $posts_array = $wpdb->get_results("select ID,post_name from $wpdb->posts where post_type = 'sp_property'");
@@ -269 +278 @@
         }
         
+        update_option( 'sc-soldpress_photo_sync-end',time() );
+        update_option( 'sc-soldpress_photo_sync-start-status', false );
         $this->WriteLog('End Picture Sync');    
     }

soldpress/branches/0.9.5A/settings.php

@@ -87 +87 @@
                     <tr valign="top">
                     <th scope="row">Last Update</th>
-                    <td><?php echo date('r', get_option('sc-lastupdate' )) ?></td>
+                    <td><?php echo get_option('sc-lastupdate' )->format('Y-m-d'); ?></td>
                     </tr>
                 </table>
@@ -112 +112 @@
             <thead>
                 <tr class="thead">
-                    <th scope="col" class="check-column"><input type="checkbox" class="check-all-entries"></th>
+                    <th>Job</th>
                     <th>Time</th>
-                    <th>Function</th>
                     <th>Schedule</th>
                     <th>Interval</th>
-                    <th>Options</th>
+                    <th>Last Start</th>
+                    <th>Last End</th>
                 </tr>
             </thead>
             <tfoot>
                 <tr class="thead">
-                    <th scope="col" class="check-column"><input type="checkbox" class="check-all-entries"></th>
-                    <th>Function</th>
+                    
+                    <th>Job</th>
                     <th>Time</th>
                     <th>Schedule</th>
@@ -132 +132 @@
             </tfoot>
             <tbody>
-                <tr class="entry-row alternate">
-                    <th scope="row" class="check-column"><input type="checkbox" name="schedules[]" class="entries" value="1"></th>
-                    <td>soldpress_listing_sync
-                        <div class="row-actions" style="margin:0; padding:0;">
-                                <a href="/wp-admin/admin.php?page=pluginbuddy_backupbuddy-scheduling&amp;edit=1">Edit this schedule</a>
-                            </div>
-                    </td>
-                    <td style="white-space: nowrap;">daily</td>
-                    <td style="white-space: nowrap;">86400</td>
-                    <td>Mar 30, 2013 6:27PM</td>
-                    <td>Mar 30, 2013 6:27PM</td>
-                    <td>Run Now</td>
-                </tr>
-                <tr class="entry-row alternate">
-                    <th scope="row" class="check-column"><input type="checkbox" name="schedules[]" class="entries" value="1"></th>
-                    <td>soldpress_photo_sync
-                        <div class="row-actions" style="margin:0; padding:0;">
-                                <a href="/wp-admin/admin.php?page=pluginbuddy_backupbuddy-scheduling&amp;edit=1">Edit this schedule</a>
-                            </div>
-                    </td>
-                    <td style="white-space: nowrap;">hourly</td>
-                    <td style="white-space: nowrap;">3600</td>
-                    <td>Mar 30, 2013 6:27PM</td>
-                    <td>Mar 30, 2013 6:27PM</td>
-                    <td>Run Now</td>
-                </tr>
+    
+    <?php $time_slots = _get_cron_array();
+        
+        $tr_class = "";
+            foreach ($time_slots as $key => $jobs) {    
+                foreach ($jobs as $job => $value) {
+                    if($job == 'soldpress_photo_sync' || $job == 'soldpress_listing_sync'){
+                            echo '<tr>';
+                        //  echo '<th scope="row" class="check-column"><input type="checkbox" name="schedules[]" class="entries" value="1"></th>';
+                            echo '<td><strong>'.$job.'</strong><div class="row-actions" style="margin:0; padding:0;"><a href="/wp-admin/admin.php?page=pluginbuddy_backupbuddy-scheduling&amp;edit=1">Run Now</a> | <a href="/wp-admin/admin.php?page=pluginbuddy_backupbuddy-scheduling&amp;edit=1">Disable</a></div></td>';
+                            
+                            echo '<td>'.date("r", $key).'</td>';                            
+                            $schedule = $value[key($value)];
+                            echo '<td>'.(isset($schedule["schedule"]) ? $schedule["schedule"] : "").'</td>';
+                            echo '<td class="aright">'.(isset($schedule["interval"]) ? $schedule["interval"] : "").'</td>';                         
+                            echo '<td class="aright">'. Date('r',get_option('sc-'.$job.'-start' )) ;
+                            echo '</td>';
+                            echo '<td class="aright">'. Date('r',get_option('sc-'.$job.'-end' )) ;
+                            echo '</td>';
+                            echo '</tr>';
+                            if ($tr_class == "")
+                                $tr_class = "entry-row alternate ";
+                            else
+                                $tr_class = "entry-row";
+                            }
+                }
+            }
+?>
             </tbody>
         </table>
@@ -169 +171 @@
     
     <?php if( $active_tab == 'debug_options' ) {  ?>
+    <a href="/wp-content/uploads/soldpress/soldpress-log.txt">debug log</a>
      <div class = "postbox">
                 <div class = "handlediv">
@@ -199 +202 @@
     <?php } ?>
 
-    <img src="<?php echo plugins_url( 'images/soldpress.jpg' , __FILE__ );?>" >
-    <br>
-    &copy; 2013 Sanskript Solution, Inc.</div>
+    <div>&copy; 2013 Sanskript Solution, Inc.</div>
 
         
@@ -212 +213 @@
         function admin_footer() {
             $plugin_data = get_plugin_data( __FILE__ );
-            printf('%1$s ' . __("plugin", 'soldpress') .' | ' . __("Version", 'soldpress') . ' %2$s | '. __('by', 'soldpress') . ' %3$s<br />', $plugin_data['Title'], $plugin_data['Version'], $plugin_data['Author']);
+            printf('%1$s ' . __("plugin", 'SoldPress') .' | ' . __("Version", 'SoldPress') . ' %2$s | '. __('by', 'SoldPress') . ' %3$s<br />', $plugin_data['Title'], $plugin_data['Version'], $plugin_data['Author']);
+            printf('%1$s ' . __("plugin", 'soldpress') .' | ' . __("Version", 'soldpress') . ' %2$s | '. __('by', 'soldpress') . ' %3$s<br />', "SoldPress", "0.5A", "Replace");
         }
     //$date = new DateTime();
     //echo $date->getTimestamp();
+        //We Do The Get Before
+        if (isset($_GET["spa"])) {
+            $sp_action = $_GET["spa"];
+            if ($sp_action != '') {
+                    switch ($$sp_action) {
+                        case "unsevt":
+                          
+                           // wp_redirect(remove_query_arg(array('time', 'job', 'spa', 'key'), stripslashes($_SERVER['REQUEST_URI'])));
+                            exit();
+                            break;
+                        case "runevt":
+                            $job = $_GET['job'];
+                            do_action($job);
+                            wp_redirect(remove_query_arg(array('job', 'spa'), stripslashes($_SERVER['REQUEST_URI'])));
+                            exit();
+                            break;
+                    }
+            }
+                            
+        }
         
         if (isset($_POST["test_connection"])) {  
@@ -228 +250 @@
         if (isset($_POST["sync"])) {  
         
-             soldpress_listintgs();
+            do_action('soldpress_listing_sync');
         }
         
         if (isset($_POST["delete"])) {  
-            $mycustomposts = get_posts( array( 'post_type' => 'property', 'numberposts' => 500) );
+            $mycustomposts = get_posts( array( 'post_type' => 'sp_property', 'numberposts' => 500) );
                 foreach( $mycustomposts as $mypost ) {
                     echo $mypost->ID;

soldpress/branches/0.9.5A/soldpress.php

@@ -81 +81 @@
     if($adapter->connect())
     {
-        return $adapter-> sync_residentialproperty("LastUpdated=2011-05-08T22:00:17Z","");  
-        //return $adapter-> sync_residentialproperty("LastUpdated=" . $date->format('Y-m-d'),"");   
+        return $adapter-> sync_residentialproperty("LastUpdated=2011-05-08T22:00:17Z"); 
+        //return $adapter-> sync_residentialproperty("LastUpdated=" . $date->format('Y-m-d'));  
     }