Changeset 1098191

Timestamp:

02/24/2015 03:08:26 PM (11 years ago)

Author:

naveenann

Message:

Working on synchronizing data with CRON

Location:

opensearchserver-search/trunk

Files:

• index.php (modified) (1 diff)
• opensearchserver_admin.php (modified) (7 diffs)

opensearchserver-search/trunk/index.php

@@ -239 +239 @@
 add_action('admin_menu', 'opensearchserver_admin_actions');
 add_action('template_redirect', 'opensearchserver_search');
-add_filter( 'query_vars', 'add_query_vars_filter' )
+add_action('synchronize_with_cron','opensearchserver_synchronize_with_cron' );
+add_filter( 'query_vars', 'add_query_vars_filter' );
 ?>

opensearchserver-search/trunk/opensearchserver_admin.php

@@ -191 +191 @@
  * @param number $limit
  */
-function opensearchserver_checkindex(OSSIndexDocument $index, $limit = 1, $idx = 0, $total = 0) {
+function opensearchserver_checkindex(OSSIndexDocument $index, $limit = 1, $idx = 0, $total = 0 ,$is_not_cron = TRUE) {
   global $wpdb;
   if ($index->count() < $limit) {
@@ -198 +198 @@
   opensearchserver_start_indexing($index);
   $index = null;
-  wp_cache_flush();
-  $wpdb->flush();
-  if (function_exists('gc_enabled')) {
-    if (gc_enabled()) {
-      gc_collect_cycles();
-    }
-  }
-
-  if ($idx != 0 && $total != 0) {
-    $percent = (floatval($idx) / floatval($total)) * 100;
-    $mem = floatval(memory_get_usage()) / 1024 / 1024;
-    opensearchserver_display_messages(sprintf('Completed: %.2f %% (%d/%d)- Memory usage: %2f', $percent, $idx, $total, $mem));
+  if(is_not_cron) {
+    wp_cache_flush();
+    $wpdb->flush();
+    if (function_exists('gc_enabled')) {
+      if (gc_enabled()) {
+        gc_collect_cycles();
+      }
+    }
+
+    if ($idx != 0 && $total != 0) {
+      $percent = (floatval($idx) / floatval($total)) * 100;
+      $mem = floatval(memory_get_usage()) / 1024 / 1024;
+      opensearchserver_display_messages(sprintf('Completed: %.2f %% (%d/%d)- Memory usage: %2f', $percent, $idx, $total, $mem));
+    }
   }
   return new OSSIndexDocument();
@@ -227 +229 @@
     return $docs_count;
 }
-
 /*
- * Function to reindex the website.
+ * Function to reindex the website with cron.
 */
-function opensearchserver_reindex_site($id,$type, $from = 0, $to = 0) {
+function opensearchserver_reindex_site_with_cron() {
+  global $wpdb;
+  opensearchserver_reindex_init();
+  opensearchserver_delete_document('*:*');
+   $contentTypesToKeep = array();
+    foreach (get_post_types() as $post_type) {
+        if (get_option('oss_index_types_'.$post_type) == 1) {
+            $contentTypesToKeep[] = $post_type;
+        }
+    }
+    $sql_query = 'SELECT ID FROM '.$wpdb->posts.' WHERE post_status = \'publish\' AND post_type IN ("'.implode('","', $contentTypesToKeep).'") ORDER BY ID'.$limitSuffix;
+    $posts = $wpdb->get_results($sql_query);
+    $total_count = count($posts);
+    $index = new OSSIndexDocument();
+    for ($i = 0; $i < $total_count; $i++) {
+      $post = get_post($posts[$i]->ID);
+      opensearchserver_add_documents_to_index($index, $lang, $post);
+      $index = opensearchserver_checkindex($index, 200, $i, $total_count, FALSE);
+    }
+    opensearchserver_checkindex($index, 1, $i, $total_count,FALSE);
+  opensearchserver_optimize();
+  opensearchserver_autocompletionBuild();
+  return 1;
+}
+/*
+ * Function to initialize the variable for reindex.
+*/
+function opensearchserver_reindex_init() {
   global $wpdb;
   $oss_server_url = get_option('oss_serverurl');
@@ -244 +272 @@
   $ossEngineConnectTimeOut = config_request_value('ossEngineConnectTimeOut', 5, 'engineConnectTimeOut');
   $ossEngineIndex = config_request_value('ossEngineIndex', $oss_indexname, 'engineIndex');
+}
+/*
+ * Function to reindex the website.
+*/
+function opensearchserver_reindex_site($id,$type, $from = 0, $to = 0) {
+  global $wpdb;
+  opensearchserver_reindex_init();
   if($id) {
     $delete='id:'.$type.'_'.$id;
@@ -858 +893 @@
 
 function opensearchserver_admin_set_reindex() {
-  $oss_index_from = isset($_POST['oss_index_from']) ? $_POST['oss_index_from'] : NULL;
-  $oss_index_to = isset($_POST['oss_index_to']) ? $_POST['oss_index_to'] : NULL;
-  update_option('oss_index_from', $oss_index_from);
-  update_option('oss_index_to', $oss_index_to);
-  $index_success = opensearchserver_reindex_site(NULL,NULL, $oss_index_from, $oss_index_to);
-  $suffix = ($oss_index_from !== null && $oss_index_from != '' && $oss_index_to !== null && $oss_index_to != '') ? '(indexed documents from #'.$oss_index_from.' to #'.$oss_index_to.')' : '';
-  opensearchserver_display_messages('Re indexing has been finished successfully '. $suffix .'.');
-}
+  $post_oss_submit = $_POST['opensearchserver_submit'];
+  if($post_oss_submit == 'Synchronize with CRON') {
+    wp_schedule_single_event(time(), 'synchronize_with_cron');
+    opensearchserver_display_messages('Re indexing has been successfully scheduled with cron will be executed in next 15 minutes.');
+  }else {
+    $oss_index_from = isset($_POST['oss_index_from']) ? $_POST['oss_index_from'] : NULL;
+    $oss_index_to = isset($_POST['oss_index_to']) ? $_POST['oss_index_to'] : NULL;
+    update_option('oss_index_from', $oss_index_from);
+    update_option('oss_index_to', $oss_index_to);
+    $index_success = opensearchserver_reindex_site(NULL,NULL, $oss_index_from, $oss_index_to);
+    $suffix = ($oss_index_from !== null && $oss_index_from != '' && $oss_index_to !== null && $oss_index_to != '') ? '(indexed documents from #'.$oss_index_from.' to #'.$oss_index_to.')' : '';
+    opensearchserver_display_messages('Re indexing has been finished successfully '. $suffix .'.');
+  }
+}
+/*
+ * Re-index using cron
+*/
+function opensearchserver_synchronize_with_cron() {
+   opensearchserver_reindex_site_with_cron();
+}
+
+
 /*
  * The admin page settings actions
@@ -911 +960 @@
   } elseif ($action == 'opensearchserver_reindex') {
     opensearchserver_admin_set_reindex();
-  } elseif ($action == 'opensearchserver_advanced_settings') {
+  }elseif ($action == 'opensearchserver_advanced_settings') {
     opensearchserver_admin_set_advanced_settings();
   }
@@ -1537 +1586 @@
                                     name="opensearchserver_submit" value="Synchronize / Re-Index"
                                     class="button-primary" />
+                  <input type="submit"
+                  name="opensearchserver_submit" value="Synchronize with CRON"
+                  class="button-primary" />
                             </p>
                         </form>