web bugfix

Author: Yutaro Iiyama

web/cgi-bin/dynamo/detox/check_cache.php

@@ -26,11 +26,11 @@ function check_cache($history_db, $cycle, $partition_id, $snapshot_spool_path, $
   $stmt->close();
 
   if ($num_replica_table == 0 || $num_site_table == 0) {
-    $sqlite_file_name = sprintf('%s/snapshot_%d.db', $snapshot_spool_path, $cycle);
+    $sqlite_file_name = sprintf('%s/snapshot_%09d.db', $snapshot_spool_path, $cycle);
 
     if (!file_exists($sqlite_file_name)) {
       $srun = sprintf('%09d', $cycle);
-      $xz_file_name = sprintf('%s/%s/%s/snapshot_%d.db.xz', $snapshot_archive_path, substr($srun, 0, 3), substr($srun, 3, 3), $cycle);
+      $xz_file_name = sprintf('%s/%s/%s/snapshot_%09d.db.xz', $snapshot_archive_path, substr($srun, 0, 3), substr($srun, 3, 3), $cycle);
       if (!file_exists($xz_file_name))
         return false;
 
@@ -39,6 +39,7 @@ function check_cache($history_db, $cycle, $partition_id, $snapshot_spool_path, $
         return false;
 
       exec(sprintf('unxz -k -c %s > %s', $xz_file_name, $sqlite_file_name));
+      chmod($sqlite_file_name, 0666);
     }
 
     $snapshot_db = new SQLite3($sqlite_file_name);

web/cgi-bin/dynamo/detox/main.php

@@ -123,12 +123,12 @@
       $dataset_pattern = str_replace('_', '\_', $pattern);
       $dataset_pattern = str_replace('*', '%', $dataset_pattern);
       $dataset_pattern = str_replace('?', '_', $dataset_pattern);
- 
+
       $stmt = $history_db->prepare($query);
       $stmt->bind_param('s', $dataset_pattern);
       $stmt->bind_result($site_name, $dataset_name, $size, $decision, $condition_id);
       $stmt->execute();
-  
+
       $condition_ids = array();
 
       $json_data = array();
@@ -256,6 +256,7 @@
 
     $query = 'SELECT s.`id`, s.`name`, c.`status`, c.`quota` FROM ' . $site_cache_table_name . ' AS c';
     $query .= ' INNER JOIN `sites` AS s ON s.`id` = c.`site_id`';
+    $query .= ' ORDER BY s.`name`';
 
     $stmt = $history_db->prepare($query);
     $stmt->bind_result($site_id, $site_name, $status, $quota);
@@ -291,7 +292,7 @@
     $stmt->bind_result($site_id, $decision, $size);
     $stmt->execute();
     while ($stmt->fetch()) {
-      if (!in_array($site_id, $id_to_site))
+      if (!array_key_exists($site_id, $id_to_site))
         continue;
 
       $idx = $id_to_site[$site_id];
@@ -312,7 +313,7 @@
       $stmt->bind_result($site_id, $decision, $size);
       $stmt->execute();
       while ($stmt->fetch()) {
-        if (!in_array($site_id, $id_to_site))
+        if (!array_key_exists($site_id, $id_to_site))
           continue;
 
         $idx = $id_to_site[$site_id];