Changeset 415

Timestamp:

11/16/11 10:16:47 (12 years ago)

Author:

nanardon

Message:

• use numeric needupdate flag, then detect if another has been request

Location:

server/trunk/web

Files:

• bin/sophie_scan (modified) (2 diffs)
• lib/Sophie/Controller/Admin/Update.pm (modified) (2 diffs)
• lib/Sophie/Controller/Login.pm (modified) (1 diff)
• lib/Sophie/Scan.pm (modified) (1 diff)
• lib/Sophie/Scan/RpmsPath.pm (modified) (1 diff)

server/trunk/web/bin/sophie_scan

@@ -15 +15 @@
 
 foreach my $pathkey (@pkey) {
+    
     my $time = time;
-    Sophie::Scan::RpmsPath
-        ->new($pathkey, Sophie::Scan->new)
-        ->set_no_needupdate;
-    my @delta = Sophie::Scan::RpmsPath
-    ->new($pathkey, Sophie::Scan->new)
-    ->find_delta;
+    my $mark = 0;
+    my @delta;
+
+    {
+        my $path = Sophie::Scan::RpmsPath
+            ->new($pathkey, Sophie::Scan->new);
+        #$path->set_no_needupdate;
+
+        $mark = $path->get_needupdate;
+        @delta = $path->find_delta;
+    }
+
     while (my @d = splice(@delta, 0, 25)) {
         my $scan = Sophie::Scan->new;
@@ -29 +36 @@
     }
 
-    Sophie::Scan::RpmsPath->new($pathkey, Sophie::Scan->new)->set_updated
-    if (!@delta); # update only if we finished
+    if (!@delta) { # update only if we finished
+        my $path = Sophie::Scan::RpmsPath->new($pathkey, Sophie::Scan->new);
+        $path->set_updated;
+        $path->set_no_needupdate
+            if ($mark ne $path->get_needupdate);
+    }
 }
 

server/trunk/web/lib/Sophie/Controller/Admin/Update.pm

@@ -16 +16 @@
 
 =cut
-
-sub begin : Pivate {}
 
 sub paths :XMLRPC {
@@ -52 +50 @@
                     \[ " < now() - '24 hours'::interval" ],
                 ], },
-                { needupdate => 'true' },
+                { needupdate => scalar(time()) },
             ]
         },

server/trunk/web/lib/Sophie/Controller/Login.pm

@@ -36 +36 @@
                 $c->stash->{xmlrpc} = 'sophie_session=' . $c->sessionid;
             } else {
-                warn 'redirect';
                 $c->res->redirect($c->uri_for('/'));
             }

server/trunk/web/lib/Sophie/Scan.pm

@@ -30 +30 @@
                     \[ " < now() - '24 hours'::interval"],
                 ],
-                { needupdate => 'true', },
+                { needupdate => { '>' => 0 }, },
             ],
     })->get_column('d_path_key')->all

server/trunk/web/lib/Sophie/Scan/RpmsPath.pm

@@ -130 +130 @@
     $self->db->base->resultset('Paths')->find(
         { d_path_key => $self->key }
-    )->update({ needupdate => 'false' });
+    )->update({ needupdate => 0 });
     $self->db->commit;
+}
+
+sub get_needupdate {
+    my ($self) = @_;
+    $self->db->base->resultset('Paths')->find(
+        { d_path_key => $self->key }
+    )->get_column('needupdate');
 }