fix missals data paths

Liturgical-Calendar · Oct 14, 2024 · 3aa8b3f · 3aa8b3f
1 parent ab7faef
commit 3aa8b3f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Paths/Missals.php b/src/Paths/Missals.php
@@ -340,21 +340,21 @@ public static function init(array $requestPathParts = [])
         }
         self::$missalsIndex = new \stdClass();
         self::$missalsIndex->litcal_missals = [];
-        $directories = array_map('basename', glob('data/propriumdesanctis*', GLOB_ONLYDIR));
+        $directories = array_map('basename', glob('data/missals/propriumdesanctis*', GLOB_ONLYDIR));
         foreach ($directories as $directory) {
             if (file_exists("data/$directory/$directory.json")) {
                 $missal = new \stdClass();
                 if (preg_match('/^propriumdesanctis_([1-2][0-9][0-9][0-9])$/', $directory, $matches)) {
                     $missal->missal_id      = "EDITIO_TYPICA_{$matches[1]}";
                     $missal->region         = "VA";
                     //$missal->year_published = intval($matches[1]);
-                    $it = new \DirectoryIterator("glob://data/$directory/i18n/*.json");
+                    $it = new \DirectoryIterator("glob://data/missals/$directory/i18n/*.json");
                     $languages = [];
                     foreach ($it as $f) {
                         $languages[] = $f->getBasename('.json');
                     }
                     $missal->languages      = $languages;
-                    $missal->i18n_path      = "data/$directory/i18n/";
+                    $missal->i18n_path      = "data/missals/$directory/i18n/";
                     //$missal->api_path       = API_BASE_PATH . "/missals/EDITIO_TYPICA_{$matches[1]}";
                 } elseif (preg_match('/^propriumdesanctis_([A-Z]+)_([1-2][0-9][0-9][0-9])$/', $directory, $matches)) {
                     $missal->missal_id      = "{$matches[1]}_{$matches[2]}";
@@ -365,7 +365,7 @@ public static function init(array $requestPathParts = [])
                 $missal->name           = RomanMissal::getName($missal->missal_id);
                 $missal->year_limits    = RomanMissal::$yearLimits[$missal->missal_id];
                 $missal->year_published = RomanMissal::$yearLimits[$missal->missal_id][ "since_year" ];
-                $missal->data_path      = "data/$directory/$directory.json";
+                $missal->data_path      = "data/missals/$directory/$directory.json";
                 $missal->api_path       = API_BASE_PATH . "/missals/$missal->missal_id";
                 self::$missalsIndex->litcal_missals[] = $missal;
                 self::$params->addMissalRegion($missal->region);