Mercurial > hg > mgallery
comparison mgtool.php @ 299:338bc2941976
For images that have no EXIF timestamp information, always sort them "lower" compared to ones that have.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 30 Sep 2019 15:09:11 +0300 |
parents | 77f85b1f35f2 |
children | 7bccb4204e6e |
comparison
equal
deleted
inserted
replaced
298:cf166dcc6e77 | 299:338bc2941976 |
---|---|
656 } | 656 } |
657 | 657 |
658 | 658 |
659 function mgSortFunc($a, $b) | 659 function mgSortFunc($a, $b) |
660 { | 660 { |
661 if (isset($a["datetime"]) && isset($b["datetime"])) | 661 if (isset($a["datetime"]) && is_object($a["datetime"]) && |
662 { | 662 isset($b["datetime"]) && is_object($b["datetime"])) |
663 if (is_object($a["datetime"]) && is_object($b["datetime"])) | 663 $cres = $b["datetime"]->getTimestamp() - $a["datetime"]->getTimestamp(); |
664 return $b["datetime"]->getTimestamp() - $a["datetime"]->getTimestamp(); | 664 else |
665 else | 665 if (isset($a["datetime"]) && is_object($a["datetime"]) && |
666 return $b["datetime"] - $a["datetime"]; | 666 isset($b["base"])) |
667 } | 667 $cres = -1; |
668 else | |
669 if (isset($b["datetime"]) && is_object($b["datetime"]) && | |
670 isset($a["base"])) | |
671 $cres = 1; | |
668 else | 672 else |
669 if (isset($a["base"]) && isset($b["base"])) | 673 if (isset($a["base"]) && isset($b["base"])) |
670 return strcmp($b["base"], $a["base"]); | 674 $cres = strcmp($b["base"], $a["base"]); |
671 else | 675 else |
672 return 0; | 676 $cres = 0; |
677 | |
678 return $cres; | |
673 } | 679 } |
674 | 680 |
675 | 681 |
676 function mgWriteGalleryCache($cacheFilename, &$gallery, &$entries, &$parentEntry) | 682 function mgWriteGalleryCache($cacheFilename, &$gallery, &$entries, &$parentEntry) |
677 { | 683 { |