|
@@ -32,7 +32,7 @@ $convertedGuiXml = convertGuiXmlToCmdList($guiXmlString, $convertGuiXslString);
|
|
|
</ui_filter_button>
|
|
</ui_filter_button>
|
|
|
</ui_filter>
|
|
</ui_filter>
|
|
|
*/
|
|
*/
|
|
|
-echo $convertedGuiXml . "\n-----\n";
|
|
|
|
|
|
|
+echo "L." . __LINE__ . ": convertedGuiXml:\n{$convertedGuiXml}\n----------------------------------------\n";
|
|
|
|
|
|
|
|
$DBG = true;
|
|
$DBG = true;
|
|
|
$tags = array();
|
|
$tags = array();
|
|
@@ -59,7 +59,7 @@ $DBG = true;
|
|
|
// ,{"tag":"ui_filter_button","type":"close","level":2}
|
|
// ,{"tag":"ui_filter_button","type":"close","level":2}
|
|
|
// ,{"tag":"ui_filter","type":"close","level":1}]
|
|
// ,{"tag":"ui_filter","type":"close","level":1}]
|
|
|
|
|
|
|
|
- if($DBG){echo "\ntags L." . __LINE__ . ":\n" . json_encode($tags) . "\n";}
|
|
|
|
|
|
|
+ if($DBG){echo "L." . __LINE__ . ": tags\n" . json_encode($tags) . "\n";}
|
|
|
|
|
|
|
|
$filters = array();
|
|
$filters = array();
|
|
|
$filter = null;
|
|
$filter = null;
|
|
@@ -76,7 +76,7 @@ foreach ($tags as $tag) {
|
|
|
if (empty($filter->name)) throw new Exception("Empty root tag name #" . __LINE__);
|
|
if (empty($filter->name)) throw new Exception("Empty root tag name #" . __LINE__);
|
|
|
} else if ('close' == $tag['type']) {
|
|
} else if ('close' == $tag['type']) {
|
|
|
$filters[$filter->name] = $filter;
|
|
$filters[$filter->name] = $filter;
|
|
|
- } else throw new Exception("Wrong ui_filter tag typ");
|
|
|
|
|
|
|
+ } else throw new Exception("Wrong ui_filter tag type");
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
case 'ui_filter_button': {
|
|
case 'ui_filter_button': {
|
|
@@ -101,7 +101,7 @@ foreach ($tags as $tag) {
|
|
|
break;
|
|
break;
|
|
|
case 'sql_filter_openBlock': {
|
|
case 'sql_filter_openBlock': {
|
|
|
$blockType = V::get('type', '', $tag['attributes']);
|
|
$blockType = V::get('type', '', $tag['attributes']);
|
|
|
-echo "sql_filter_openBlock block Type {$blockType} attrs = " . json_encode($tag) . "\n";
|
|
|
|
|
|
|
+echo "L." . __LINE__ . ": sql_filter_openBlock block Type {$blockType} attrs = " . json_encode($tag) . "\n";
|
|
|
$filterButton->queryWhere->openBlock($blockType);
|
|
$filterButton->queryWhere->openBlock($blockType);
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
@@ -111,9 +111,9 @@ echo "sql_filter_openBlock block Type {$blockType} attrs = " . json_encode($tag)
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
default: {
|
|
default: {
|
|
|
-echo "filter = "; print_r($filter);
|
|
|
|
|
-echo "filterButton = "; print_r($filterButton);
|
|
|
|
|
-echo "filters = "; print_r($filters);
|
|
|
|
|
|
|
+echo "L." . __LINE__ . ": filter = "; print_r($filter);
|
|
|
|
|
+echo "L." . __LINE__ . ": filterButton = "; print_r($filterButton);
|
|
|
|
|
+echo "L." . __LINE__ . ": filters = "; print_r($filters);
|
|
|
throw new Exception("TODO: tag {$tag['tag']}");
|
|
throw new Exception("TODO: tag {$tag['tag']}");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -122,7 +122,7 @@ echo "filters = "; print_r($filters);
|
|
|
foreach ($filters as $filter) {
|
|
foreach ($filters as $filter) {
|
|
|
foreach ($filter->buttons as $filterButton) {
|
|
foreach ($filter->buttons as $filterButton) {
|
|
|
$filterButton->queryWhere->parseQueryWhere();
|
|
$filterButton->queryWhere->parseQueryWhere();
|
|
|
- echo "Filter({$filter->name}) Button({$filterButton->name}) Used Fields: [" . implode(",", $filterButton->queryWhere->getUsedFields()) . "]\n";
|
|
|
|
|
|
|
+ echo "L." . __LINE__ . ": Filter({$filter->name}) Button({$filterButton->name}) Used Fields: [" . implode(",", $filterButton->queryWhere->getUsedFields()) . "]\n";
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-echo "filters = "; print_r($filters);
|
|
|
|
|
|
|
+echo "L." . __LINE__ . ": filters = "; print_r($filters);
|
