From: Chris Sharp <csharp@georgialibraries.org>
Date: Wed, 28 Aug 2019 11:25:10 +0000 (-0400)
Subject: Add branching logic to accommodate v.5 templates
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=eaf0d12c51feb0d28214c88493a16d1184e8ff85;p=contrib%2Fpines%2Freport-creator.git

Add branching logic to accommodate v.5 templates

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
---

diff --git a/models/templateDecoder.class.php b/models/templateDecoder.class.php
index 0000650..415b02d 100644
--- a/models/templateDecoder.class.php
+++ b/models/templateDecoder.class.php
@@ -31,103 +31,108 @@ class templateDecoder
 		}
 				
 		$version=$jsonData->version;
-		if ($version != '3' && $version != '4') {
-			new displayMessageView('Error: Invalid template version: '.$version);
-			return NULL;
-		}
-
-		
-		$select=$jsonData->select;
-		$relCache=$jsonData->rel_cache;
-		$where=(isset($jsonData->where) ? $jsonData->where : NULL);
-		$having=(isset($jsonData->having) ? $jsonData->having : NULL);
-				
-		foreach ($select as $s )
-		{
-			$columnName=$s->column->colname;
-			$r=$s->relation;
-			$displayAggregate = isset($relCache->$r->fields->dis_tab->$columnName->aggregate) ? $relCache->$r->fields->dis_tab->$columnName->aggregate : NULL;
-			$displayTransformLabel = isset($relCache->$r->fields->dis_tab->$columnName->transform_label) ? $relCache->$r->fields->dis_tab->$columnName->transform_label : NULL;
-			$columnArray=array('name'=>$s->alias, 'aggregate'=>$displayAggregate, 'transformLabel'=>$displayTransformLabel);
-			$reportColumnsArray[] = (object) $columnArray;
-		}
-		
-		$clauses = array('where', 'having');	//look for params in both where and having clauses
-		foreach ($clauses as $c) {
-			
-			if ('where' == $c) {
-				if (NULL == $where) continue;
-				$clause = $where;
+		if ($version != '5') {
+			// we've got a XUL client template - proceed as always
+			if ($version != '3' && $version != '4') {
+				new displayMessageView('Error: Invalid template version: '.$version);
+				return NULL;
 			}
-			else {
-				if (NULL == $having) continue;
-				$clause = $having;
+	
+			
+			$select=$jsonData->select;
+			$relCache=$jsonData->rel_cache;
+			$where=(isset($jsonData->where) ? $jsonData->where : NULL);
+			$having=(isset($jsonData->having) ? $jsonData->having : NULL);
+					
+			foreach ($select as $s )
+			{
+				$columnName=$s->column->colname;
+				$r=$s->relation;
+				$displayAggregate = isset($relCache->$r->fields->dis_tab->$columnName->aggregate) ? $relCache->$r->fields->dis_tab->$columnName->aggregate : NULL;
+				$displayTransformLabel = isset($relCache->$r->fields->dis_tab->$columnName->transform_label) ? $relCache->$r->fields->dis_tab->$columnName->transform_label : NULL;
+				$columnArray=array('name'=>$s->alias, 'aggregate'=>$displayAggregate, 'transformLabel'=>$displayTransformLabel);
+				$reportColumnsArray[] = (object) $columnArray;
 			}
-		
-			foreach ($clause as $cl) {
-				$relation=$cl->relation;
-				$colName=$cl->column->colname;
-				
-				if ('where' == $c)
-					$filterTab=$relCache->$relation->fields->filter_tab;
-				else
-					$filterTab=$relCache->$relation->fields->aggfilter_tab;
-				
-				$columnLabel = str_replace('::','->',$relCache->$relation->label) .' -> '. $cl->alias;
 			
-				//Transform
-				//*** Some templates do not have a transform label
-				$transform = $cl->column->transform;
-				if (isset($cl->column->transform_label)) {
-					$transformLabel = $cl->column->transform_label;
+			$clauses = array('where', 'having');	//look for params in both where and having clauses
+			foreach ($clauses as $c) {
+				
+				if ('where' == $c) {
+					if (NULL == $where) continue;
+					$clause = $where;
 				}
 				else {
-					$transformLabel = '';
+					if (NULL == $having) continue;
+					$clause = $having;
 				}
 			
-				//Data Type
-				$dataType=$filterTab->$colName->datatype;
-				$tableName=$relCache->$relation->table;
-			
-				//Action / Operation		
-				$op=$filterTab->$colName->op;
-				$opLabel=$filterTab->$colName->op_label;
-				$fieldDoc = isset($filterTab->$colName->field_doc) ? $filterTab->$colName->field_doc : NULL;
-				$aggregate = isset($filterTab->$colName->aggregate) ? $filterTab->$colName->aggregate : NULL;				
-				$P=$cl->condition;	
-
-				list($key, $opValue) = each($P);							//get the first (and only) value
-				if (is_array($opValue)) $opValue = implode(',', $opValue);	//if array convert it back to a string
-			
-				$paramsArray = array(
-						 	'column' => $columnLabel
-							,'transform' => $transform
-							,'transformLabel' => $transformLabel
-							,'op' => $op
-							,'opLabel' => $opLabel
-							,'param'=> $opValue
-							,'fieldDoc' => $fieldDoc
-							,'aggregate' => $aggregate
-							,'dataType' => $dataType
-							,'table' => $relCache->$relation->table
-							);
-			
-				//if (mb_substr($opValue,0,3,'UTF-8')=='::P') {
-				if (substr($opValue,0,3) == '::P') {
-					$userParamsArray[] = (object) $paramsArray;
-				}
-				else {
-					$staticParamsArray[] = (object) $paramsArray;
+				foreach ($clause as $cl) {
+					$relation=$cl->relation;
+					$colName=$cl->column->colname;
+					
+					if ('where' == $c)
+						$filterTab=$relCache->$relation->fields->filter_tab;
+					else
+						$filterTab=$relCache->$relation->fields->aggfilter_tab;
+					
+					$columnLabel = str_replace('::','->',$relCache->$relation->label) .' -> '. $cl->alias;
+				
+					//Transform
+					//*** Some templates do not have a transform label
+					$transform = $cl->column->transform;
+					if (isset($cl->column->transform_label)) {
+						$transformLabel = $cl->column->transform_label;
+					}
+					else {
+						$transformLabel = '';
+					}
+				
+					//Data Type
+					$dataType=$filterTab->$colName->datatype;
+					$tableName=$relCache->$relation->table;
+				
+					//Action / Operation		
+					$op=$filterTab->$colName->op;
+					$opLabel=$filterTab->$colName->op_label;
+					$fieldDoc = isset($filterTab->$colName->field_doc) ? $filterTab->$colName->field_doc : NULL;
+					$aggregate = isset($filterTab->$colName->aggregate) ? $filterTab->$colName->aggregate : NULL;				
+					$P=$cl->condition;	
+	
+					list($key, $opValue) = each($P);							//get the first (and only) value
+					if (is_array($opValue)) $opValue = implode(',', $opValue);	//if array convert it back to a string
+				
+					$paramsArray = array(
+							 	'column' => $columnLabel
+								,'transform' => $transform
+								,'transformLabel' => $transformLabel
+								,'op' => $op
+								,'opLabel' => $opLabel
+								,'param'=> $opValue
+								,'fieldDoc' => $fieldDoc
+								,'aggregate' => $aggregate
+								,'dataType' => $dataType
+								,'table' => $relCache->$relation->table
+								);
+				
+					//if (mb_substr($opValue,0,3,'UTF-8')=='::P') {
+					if (substr($opValue,0,3) == '::P') {
+						$userParamsArray[] = (object) $paramsArray;
+					}
+					else {
+						$staticParamsArray[] = (object) $paramsArray;
+					}
 				}
 			}
-		}
-				
-		$returnObj->docURL = isset($jsonData->doc_url) ? $jsonData->doc_url : NULL;		//version 4 templates only
-		$returnObj->reportColumns = (object) $reportColumnsArray;
-		$returnObj->userParams = (object) $userParamsArray;
-		$returnObj->staticParams = (object) $staticParamsArray;
-
-		return($returnObj);
+					
+			$returnObj->docURL = isset($jsonData->doc_url) ? $jsonData->doc_url : NULL;		//version 4 templates only
+			$returnObj->reportColumns = (object) $reportColumnsArray;
+			$returnObj->userParams = (object) $userParamsArray;
+			$returnObj->staticParams = (object) $staticParamsArray;
+	
+			return($returnObj);
+		} else {
+			// we're in a version 5 (web) template
+			
 	}
 }	
 ?>