Changeset 45261

Timestamp:

05/11/08 17:25:33 (2 months ago)

Author:

misterbisson

Message:

alpha

Files:

• bsuite/trunk/core.php (modified) (5 diffs)

bsuite/trunk/core.php

@@ -192 +192 @@
             add_filter('cron_schedules', array(&$this, 'cron_reccurences'));
             if( $this->loadavg < 4 ){ // only do cron if load is low-ish
-                  add_filter('bsuite_interval', array(&$this, 'bstat_migrator'));
+//                add_filter('bsuite_interval', array(&$this, 'bstat_migrator'));
 //                add_filter('bsuite_interval', array(&$this, 'searchsmart_upindex_passive'));
             }
@@ -616 +616 @@
 
             if ( 
-                  ( get_option('bsuite_doing_migration') > time() ) || 
-                  ( get_option('bsuite_doing_report') > time() )
+                  ( get_option( 'bsuite_doing_migration') > time() ) || 
+                  ( get_option( 'bsuite_doing_report') > time() )
             )
                   return( TRUE );
 
-            update_option('bsuite_doing_migration', time() + 250 );
+            update_option( 'bsuite_doing_migration', time() + 250 );
+            $status = get_option ( 'bsuite_doing_migration_status' );
 
             $getcount = 100;
@@ -633 +634 @@
                   LIMIT $getcount" );
             
+            $status['count_incoming'] = count( $res );
+            update_option( 'bsuite_doing_migration_status', $status );
+
             foreach( $res as $hit ){
                   $object_id = $object_type = $session_id = 0;
@@ -671 +675 @@
             }
 
-            if( count( $targets )){
+            $status['count_targets'] = count( $targets );
+            $status['count_searchwords'] = count( $searchwords );
+            $status['count_shistory'] = count( $shistory );
+            update_option( 'bsuite_doing_migration_status', $status );
+
+            if( count( $targets ) && !$status['did_targets'] ){
                   if ( false === $wpdb->query( "INSERT INTO $this->hits_targets (object_id, object_type, hit_count, hit_date) VALUES ". implode( $targets, ',' ) ." ON DUPLICATE KEY UPDATE hit_count = hit_count + 1;" ))
                         return new WP_Error('db_insert_error', __('Could not insert bsuite_hits_target into the database'), $wpdb->last_error);
-            }
-            
-            if( count( $searchwords )){
+
+                  $status['did_targets'] = 1 ;
+                  update_option( 'bsuite_doing_migration_status', $status );
+            }
+            
+            if( count( $searchwords ) && !$status['did_searchwords'] ){
                   if ( false === $wpdb->query( "INSERT INTO $this->hits_searchwords (object_id, object_type, term_id, hit_count, hit_date) VALUES ". implode( $searchwords, ',' ) ." ON DUPLICATE KEY UPDATE hit_count = hit_count + 1;" ))
                         return new WP_Error('db_insert_error', __('Could not insert bsuite_hits_searchword into the database'), $wpdb->last_error);
-            }
-
-            if( count( $shistory )){
+
+                  $status['did_searchwords'] = 1;
+                  update_option( 'bsuite_doing_migration_status', $status );
+            }
+
+            if( count( $shistory ) && !$status['did_shistory'] ){
                   if ( false === $wpdb->query( "INSERT INTO $this->hits_shistory (sess_id, object_id, object_type) VALUES ". implode( $shistory, ',' ) .';' ))
                         return new WP_Error('db_insert_error', __('Could not insert bsuite_hits_session_history into the database'), $wpdb->last_error);
+
+                  $status['did_shistory'] = count( $shistory );
+                  update_option( 'bsuite_doing_migration_status', $status );
             }
 
             if( count( $res )){
                   if ( false === $wpdb->query( "DELETE FROM $this->hits_incoming WHERE in_time < '$since' ORDER BY in_time ASC LIMIT ". count( $res ) .';'))
-                        return new WP_Error('db_insert_error', __('Could not clean up the incomin stats table'), $wpdb->last_error);
+                        return new WP_Error('db_insert_error', __('Could not clean up the incoming stats table'), $wpdb->last_error);
                   if( $getcount > count( $res ))
                         $wpdb->query( "OPTIMIZE TABLE $this->hits_incoming;");
@@ -733 +751 @@
 
             update_option( 'bsuite_doing_migration', 0 );
+            update_option( 'bsuite_doing_migration_status', array() );
             return(TRUE);
       }