# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1564661472 -10800
# Node ID 418f932763f246da90d60f93534d448dac6378dc
# Parent  13a23b120e72814fee9fc777ca1fc9878b10be02
Backed out changeset 13a23b120e72

diff -r 13a23b120e72 -r 418f932763f2 mgtool.php
--- a/mgtool.php	Thu Aug 01 14:42:06 2019 +0300
+++ b/mgtool.php	Thu Aug 01 15:11:12 2019 +0300
@@ -673,7 +673,7 @@
 }
 
 
-function mgWriteGalleryCache($cacheFilename, &$album, &$entries, &$parentEntry)
+function mgWriteGalleryCache($cacheFilename, &$gallery, &$entries, &$parentEntry)
 {
   global $galBackend, $db, $galExifConversions, $flagSQL;
 
@@ -705,10 +705,10 @@
     // Choose gallery album image
     if (count($images) > 0)
     {
-      if (isset($album["albumpic"]) &&
-          isset($images[$album["albumpic"]]))
+      if (isset($gallery["albumpic"]) &&
+          isset($images[$gallery["albumpic"]]))
       {
-        $parentEntry["image"] = $album["albumpic"];
+        $parentEntry["image"] = $gallery["albumpic"];
       }
       else
       {
@@ -735,8 +735,8 @@
 
       mgDBBeginTransaction();
 
-      if (($path_id = mgFetchSQLColumn(mgPrepareSQL("SELECT id FROM paths WHERE path=%s", $album["path"]))) === FALSE &&
-          ($path_id = mgExecSQLInsert(mgPrepareSQL("INSERT INTO paths (path) VALUES (%s)", $album["path"]))) === FALSE)
+      if (($path_id = mgFetchSQLColumn(mgPrepareSQL("SELECT id FROM paths WHERE path=%s", $gallery["path"]))) === FALSE &&
+          ($path_id = mgExecSQLInsert(mgPrepareSQL("INSERT INTO paths (path) VALUES (%s)", $gallery["path"]))) === FALSE)
         mgFatal("Failed.\n");
 
 
@@ -816,7 +816,7 @@
 
   $str =
     "<?php\n".
-    "\$galData = ".var_export($album, TRUE).";\n".
+    "\$galData = ".var_export($gallery, TRUE).";\n".
     "\$galAlbumsIndex = ".var_export(array_keys($albums), TRUE).";\n".
     "\$galImagesIndex = ".var_export(array_keys($images), TRUE).";\n".
     "\$galEntries = ".var_export($output, TRUE).";\n".
@@ -869,7 +869,7 @@
   // Cleanup mode
   if ($mode == GCMD_CLEAN)
   {
-    $album = [];
+    $gallery = [];
 
     if ($writeMode)
     {
@@ -913,11 +913,11 @@
 
     // Read caption data
     $captions = mgReadCaptionsFile($basepath, $path);
-    $album = mgGetAlbumData($basepath, $path);
+    $gallery = mgGetAlbumData($basepath, $path);
     if ($parentData !== NULL && $parentEntry !== NULL)
     {
-      $album["parent"] = &$parentData;
-      mgCopyEntryData($album, $parentEntry, MG_STR, "caption", "caption");
+      $gallery["parent"] = &$parentData;
+      mgCopyEntryData($gallery, $parentEntry, MG_STR, "caption", "caption");
     }
 
     // Start actual processing
@@ -930,8 +930,8 @@
 
       $nentry++;
       $efilename = $path."/".$ename;
-      $medFilename = $medPath."/".$ename.".".mgGetAlbumSetting($album, "med_format");
-      $tnFilename = $tnPath."/".$ename.".".mgGetAlbumSetting($album, "tn_format");
+      $medFilename = $medPath."/".$ename.".".mgGetSetting("med_format");
+      $tnFilename = $tnPath."/".$ename.".".mgGetSetting("tn_format");
       $capFilename = $path."/".$edata["base"].".txt";
 
       if (array_key_exists($ename, $galEntries))
@@ -1056,7 +1056,7 @@
     $epath = $path."/".$ename."/";
     $newWriteMode = ($writeMode === FALSE && $epath == $startAt) || $writeMode;
 
-    if (!mgHandleDirectory($mode, $basepath, $epath, $album, $edata, $newWriteMode, $startAt))
+    if (!mgHandleDirectory($mode, $basepath, $epath, $gallery, $edata, $newWriteMode, $startAt))
       return FALSE;
   }
 
@@ -1064,7 +1064,7 @@
   if ($mode == GCMD_UPDATE || $mode == GCMD_RESCAN)
   {
     // Store gallery cache for this directory
-    if ($writeMode && !mgWriteGalleryCache($cacheFilename, $album, $entries, $parentEntry))
+    if ($writeMode && !mgWriteGalleryCache($cacheFilename, $gallery, $entries, $parentEntry))
       return FALSE;
   }