changeset 970:9c93a3c4f95c

Clean out the debug code, etc.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 29 Nov 2014 10:25:55 +0200
parents 26ae3f21a3bb
children d28f36ced178
files faptool.php
diffstat 1 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/faptool.php	Sat Nov 29 10:13:20 2014 +0200
+++ b/faptool.php	Sat Nov 29 10:25:55 2014 +0200
@@ -22,7 +22,8 @@
     $isTemp = TRUE;
     if (wtExec(
       "/usr/local/bin/gfxconv",
-      escapeshellarg($inFilename)." -f png -o ".escapeshellarg($tmpFilename)) === false)
+      escapeshellarg($inFilename)." -f png -o ".escapeshellarg($tmpFilename),
+      0) === false)
       return FALSE;
 
     if (!file_exists($tmpFilename))
@@ -249,7 +250,7 @@
     return TRUE;
   }
   else
-  if ($mode != "upd")
+  if ($mode != "gen")
     die("ERROR: Unsupported previews mode ".$mode."\n");
 
   // Check validity of previews
@@ -321,9 +322,6 @@
       $found = wtEntryToSource($compo, $filename, $edata, $filename, $pdata, $outFilename);
     }
     
-    printf("X: %d, %d\n", $edata["class"], $compo["preview_type"]);
-    print_r($edata);
-
     if (!$found)
     {
       echo "WARNING: Could not generate preview from entry ".wtNiceName($compo, $entry, $efile)."\n";
@@ -547,7 +545,7 @@
     "  previews <cmd> [args]\n".
     "    Where <cmd> is one of:\n".
     "    status [cid]  - List files and show what is missing, etc. (All or <cid>)\n".
-    "    update   - Generate preview files that are missing OR out of date.\n".
+    "    generate   - Generate preview files that are missing OR out of date.\n".
     "               (older then preview source file OR entry file where appropriate)\n".
 //    "    add <entry_id> <filename> - Add file as preview for entry_id.\n".
     "\n".
@@ -738,7 +736,7 @@
     $mode = substr(stCArgLC(2), 0, 3);
     switch ($mode)
     {
-      case "upd":
+      case "gen":
       case "sta":
       case "lis":
         $sql = (stCArg(3) != "") ? " AND id=".intval(stCArg(3)) : "";