From 677ade16828b1b823e3580e3131a7d73474281f7 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Mon, 8 Feb 2016 21:09:56 +0000
Subject: [PATCH] Recover remaining photos

---
 _data/gallery/2014-geneva-history-museum.yml |  7 ++++++-
 _data/gallery/2014-geneva-maison-tavel.yml   |  7 ++++++-
 _data/gallery/2014-geneva.yml                |  7 ++++++-
 _data/gallery/2014-room.yml                  | 18 +++++++++++++++++-
 _layouts/gallery-index.html                  |  2 +-
 _scripts/gallery-consistency.php             |  9 ++++++---
 6 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/_data/gallery/2014-geneva-history-museum.yml b/_data/gallery/2014-geneva-history-museum.yml
index 93001e2..0d2bdc1 100644
--- a/_data/gallery/2014-geneva-history-museum.yml
+++ b/_data/gallery/2014-geneva-history-museum.yml
@@ -78,4 +78,9 @@ photos:
     date: 2014-12-21 10:43:49
     file: IMG_20141221_104348
     latitude: 46.207992527778
-    longitude: 6.1467237222222 {  } {  }
\ No newline at end of file
+    longitude: 6.1467237222222
+  44bf55d:
+    date: 2014-12-21 10:43:49
+    file: IMG_20141221_104348
+    latitude: 46.207992527778
+    longitude: 6.1467237222222
\ No newline at end of file
diff --git a/_data/gallery/2014-geneva-maison-tavel.yml b/_data/gallery/2014-geneva-maison-tavel.yml
index 619481a..2a94ca3 100644
--- a/_data/gallery/2014-geneva-maison-tavel.yml
+++ b/_data/gallery/2014-geneva-maison-tavel.yml
@@ -66,4 +66,9 @@ photos:
     date: 2014-12-21 11:59:10
     file: IMG_20141221_115909
     latitude: 46.201538083333
-    longitude: 6.1467084722222 {  } {  }
\ No newline at end of file
+    longitude: 6.1467084722222 {  } {  }
+  de97857:
+    date: 2014-12-21 11:59:10
+    file: IMG_20141221_115909
+    latitude: 46.201538083333
+    longitude: 6.1467084722222
\ No newline at end of file
diff --git a/_data/gallery/2014-geneva.yml b/_data/gallery/2014-geneva.yml
index 431f7ee..07246d6 100644
--- a/_data/gallery/2014-geneva.yml
+++ b/_data/gallery/2014-geneva.yml
@@ -70,4 +70,9 @@ photos:
     date: 2014-12-21 12:02:28
     file: IMG_20141221_120228
     latitude: 46.201538083333
-    longitude: 6.1467084722222 {  } {  }
\ No newline at end of file
+    longitude: 6.1467084722222 {  } {  }
+  a1ac979:
+    date: 2014-12-21 12:02:28
+    file: IMG_20141221_120228
+    latitude: 46.201538083333
+    longitude: 6.1467084722222
\ No newline at end of file
diff --git a/_data/gallery/2014-room.yml b/_data/gallery/2014-room.yml
index f7f44e6..4c71059 100644
--- a/_data/gallery/2014-room.yml
+++ b/_data/gallery/2014-room.yml
@@ -99,4 +99,20 @@ photos:
     model: One S
     make: HTC
     latitude: 56.330379472222
-    longitude: -2.8101570555556 {  } {  }
\ No newline at end of file
+    longitude: -2.8101570555556 {  } {  }
+  124902b:
+    aperture: f/2.9
+    date: 1970-01-01 00:59:59
+    exif:
+      make: OLYMPUS OPTICAL CO.,LTD
+    exposure: 10/300
+    file: Storage
+    model: C300Z,D550Z
+  2e06105:
+    aperture: f/2.9
+    date: 1970-01-01 00:59:59
+    exif:
+      make: OLYMPUS OPTICAL CO.,LTD
+    exposure: 10/400
+    file: Room
+    model: C300Z,D550Z
\ No newline at end of file
diff --git a/_layouts/gallery-index.html b/_layouts/gallery-index.html
index 5c0a4f2..9ee5deb 100644
--- a/_layouts/gallery-index.html
+++ b/_layouts/gallery-index.html
@@ -53,7 +53,7 @@ layout: default
     {% endfor %}
     </div>    
     </section>
-    {% if false != page.comments %}
+    {% if page.comments != false %}
         {% include disqus.html %}
     {% endif %}
 </section>
\ No newline at end of file
diff --git a/_scripts/gallery-consistency.php b/_scripts/gallery-consistency.php
index d8d68af..290198c 100644
--- a/_scripts/gallery-consistency.php
+++ b/_scripts/gallery-consistency.php
@@ -67,7 +67,8 @@ foreach (glob(sprintf('%s%s*.yml', $sDataDir, DIRECTORY_SEPARATOR)) as $sFile) {
                     printf("    <%s> no date!\n", $sPhoto);
                     continue;
                 } else {
-                    $aPhotoYaml['date'] = date('Y-m-d H:i:s', $aPhotoYaml['date']);
+                    $sDate = @date('Y-m-d H:i:s', $aPhotoYaml['date']);
+                    $aPhotoYaml['date'] = $sDate ? $sDate : '!';
                 }
                 if (isset($aPhotoYaml['location'])) {
                     $aPhotoYaml = array_merge($aPhotoYaml, $aPhotoYaml['location']);
@@ -75,8 +76,10 @@ foreach (glob(sprintf('%s%s*.yml', $sDataDir, DIRECTORY_SEPARATOR)) as $sFile) {
                 }
                 $aFix[$sPhoto] = $aPhotoYaml;
             }
-            $sFix = substr(yamlDump(array('' => $aFix)), 1);
-            file_put_contents($sFile, trim(sprintf("%s%s", file_get_contents($sFile), $sFix)));
+            if (count($aFix) > 0) {
+                $sFix = substr(yamlDump(array('' => $aFix)), 1);
+                file_put_contents($sFile, trim(sprintf("%s%s", file_get_contents($sFile), $sFix)));
+            }
         }
     }
     if ($bReferenceOnly) {