CDPP / AMDA_Integration

Commit cebaa4ba23ef8bb13fac1182dedfbc43d5458522

Authored by Benjamin Renard
2 parents a928f9d3 5c9a58ff
Exists in master and in 54 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, anr_tempete, cu2022, density_maps, develop, expression-parser-bre, frames-transformation, master_vge, mlplasmas, multiplot, rm_6912, rm_7926, rm_8932, save-other-requests, test-merge, ws_get_catalog

Merge branch 'master' into expression-parser-bre

Showing 1 changed file with 7 additions and 5 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/TimeTables/IHMInputOutputTTClass.php
  Diff comments   View file @cebaa4b
... ... @@ -39,15 +39,17 @@ class IHMInputOutputTTClass implements InputOutputInterface
39 39 {
40 40 //create a list of data to treat
41 41 $processData = new TTRequestDataClass();
42   - if (strpos($tt->id,"sharedtimeTable_") === 0) {
43   - //Shared TimeTable
44   - $result = IHMSharedObjectsClass::getPath("timeTable", $tt->id);
  42 +
  43 + if (strpos($tt->id,"sharedtimeTable_") === 0 || strpos($tt->id,"sharedcatalog_") === 0) {
  44 + //Shared TimeTable /Catalog
  45 + $objectType = strpos($tt->id,"timeTable") != 0 ? "timeTable" : "catalog";
  46 + $result = IHMSharedObjectsClass::getPath($objectType, $tt->id);
45 47 if (!$result['success'])
46   - throw new Exception('Shared TimeTable '.$tt->name.' not found');
  48 + throw new Exception('Shared '.$objectType.' '.$tt->name.' not found');
47 49 $ttName = $result['path'];
48 50 }
49 51 else {
50   - //User TimeTable
  52 + //User TimeTable / Catalog
51 53 $ttName = IHMConfigClass::getUserTTPath().$tt->id.'.xml';
52 54 }
53 55 if (!file_exists($ttName))
... ...