Menu
▾
▴
[Digir-cvs] SF.net SVN: digir: [733] tapirbuilder/trunk/lib/TpToolQueryFilterCombo.php
|
From: <rd...@us...> - 2008-07-15 22:50:21
|
Revision: 733
http://digir.svn.sourceforge.net/digir/?rev=733&view=rev
Author: rdg
Date: 2008-07-15 15:50:13 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
Fixed indentation.
Modified Paths:
--------------
tapirbuilder/trunk/lib/TpToolQueryFilterCombo.php
Modified: tapirbuilder/trunk/lib/TpToolQueryFilterCombo.php
===================================================================
--- tapirbuilder/trunk/lib/TpToolQueryFilterCombo.php 2008-07-12 20:04:39 UTC (rev 732)
+++ tapirbuilder/trunk/lib/TpToolQueryFilterCombo.php 2008-07-15 22:50:13 UTC (rev 733)
@@ -57,15 +57,16 @@
//main class (building an HTML table contaning the query filter)
// -first parameter is an indexer (should be set to "0" at first call)
- // indexer has the followng form: "0" : filter for the first concept,
- // "3" : filter for the 4th cocnept
- // "3x0": filter for the first nested concept inside the the concept
- // "7x9x11": filter for the 12th nested concept inside the 10th nested concept
- // inside the 8th nested cocnept (8 nested levels)
+ // indexer has the followng form:
+ // "0" : filter for the 1st concept
+ // "3" : filter for the 4th concept
+ // "3x0": filter for the 1st nested concept inside the 4th concept
+ // "7x9x11": filter for the 12th nested concept inside the 10th nested concept
+ // inside the 8th nested concept (8 nested levels)
// this indexer is a suffix which is common to every controls related to the same source concept
- // -2nd s the name of the HTML control containing the URL of the CNS schea
+ // -2nd s the name of the HTML control containing the URL of the CNS schema
// -3rd is list of available binary operations (see "getBinaryOps" below)
- // -4th is a list of available miltiple operations (see "getMultipleOps" below)
+ // -4th is a list of available multiple operations (see "getMultipleOps" below)
// -5th is a list of available unary ops (see "getUnaryOps" below)
// currently not operational (negation is hardcoded)!
// -6th is a list of arithmetical operation (see "getArithmOps" below)
@@ -80,7 +81,7 @@
$returnedHTML.="<table id=\"mainTable_".$indexer."\" style=\"background-color: rgb(192,213,255);\">\n";
$returnedHTML.="<tr>";
$returnedHTML.="<td>";
- //table defining the Tapr filter (call to a function able to be called recursively for nested levels within filters)
+ //table defining the Tapir filter (call to a function able to be called recursively for nested levels within filters)
$htmlTable=TpToolQueryFilterCombo::buildTableHTML($indexer, $nameCNSControl, $listBinaryOps, $listMultipleOps, $listUnaryOps, $listArithmeticalOps, $listLogicalCombinations, $nameFormForCallBack, "", 1);
$returnedHTML.=$htmlTable;
@@ -421,24 +422,15 @@
//close main table
$returnedHTML.="</table>";
-
-
-
-
}//end loop
-
-
}
-
//return HTML
return $returnedHTML;
-
}
-
public static function buildHTMLMappingCtrl($indexer, $nameCNSControl, $listBinaryOps, $listMultipleOps, $listUnaryOps, $listArithmeticalOps, $listLogicalCombinations, $nameFormForCallBack)
{
@@ -1525,8 +1517,8 @@
{
//retrieve the current boolean combination and store it in "$valueForHigherBooleanSameLevel"
$HTMLPrefixBooleanSameLevel=HTML_NAME_BOOLEAN_COMBINATION_PREFIX.SEPARATOR_IN_EXTERNAL_BOOLEAN_COMBINATION_HTML;
- $currentBooleanValue=TpToolUtils::returnPostBackValue($HTMLPrefixBooleanSameLevel."_".$indexer);
+ $currentBooleanValue=TpToolUtils::returnPostBackValue($HTMLPrefixBooleanSameLevel."_".$indexer);
//initialize "nextIndexerValueSameLevel"
$nextIndexerValueSameLevel=(int)$lastIndexerValueSameLevel;
$nextIndexerValueStringSameLevel=(string)$nextIndexerValueSameLevel;
@@ -1670,42 +1662,42 @@
//retaining the value of last indexer is "0"
$nextIndexerAssociatedTermsString="0";
- //if last indexer has been returned by
- //an HTTP value copy it into
- //"$nextIndexerAssociatedTermsString"
- //(it means they the comparison operations is in ("A in Array")
- if(isset($lastIndexerAssociatedTerms)===true)
+ //if last indexer has been returned by
+ //an HTTP value copy it into
+ //"$nextIndexerAssociatedTermsString"
+ //(it means they the comparison operations is in ("A in Array")
+ if(isset($lastIndexerAssociatedTerms)===true)
+ {
+ if(is_numeric($lastIndexerAssociatedTerms)===true)
{
- if(is_numeric($lastIndexerAssociatedTerms)===true)
- {
- $nextIndexerAssociatedTerms=$lastIndexerAssociatedTerms;
- $nextIndexerAssociatedTermsString=(string)$lastIndexerAssociatedTerms;
- }
+ $nextIndexerAssociatedTerms=$lastIndexerAssociatedTerms;
+ $nextIndexerAssociatedTermsString=(string)$lastIndexerAssociatedTerms;
}
+ }
- //browse each concept which are defiend as aa right term of the comparison
- for($i=0;$i<=$nextIndexerAssociatedTerms;$i++)
- {
+ //browse each concept which are defiend as aa right term of the comparison
+ for($i=0;$i<=$nextIndexerAssociatedTerms;$i++)
+ {
- //suffix becomes composite by itself
- //root of common for all controls is:
- //(ex "0Nested0", "ONested1", "1Nested0" etc...)
- //(see also "TpToolSearchTemplateBuilder")
- $tmpIndexer=(string)$indexer.HTML_SEPARATOR_FOR_ASSOCIATION_OF_TERMS.(string)$i;
- //for left term
- //(ex "0Nested0Left", "ONested1Left", "1Nested0Left" etc...)
- $suffixLeftTerm=$tmpIndexer.HTML_NAME_LEFT_TERM_SUFFIX;
- //right term (for arithemetical ops)
- //(ex "0Nested0Right", "ONested1Right", "1Nested0Right" etc...)
- // (currently arithmetical ops are not handled by this class
- // but can be displayed by "TpToolSearchFilterBuilder.php" and
- // "TpToolSearchTemplateBuilder.php")
- $suffixRightTerm=$tmpIndexer.HTML_NAME_RIGHT_TERM_SUFFIX;
- //call function which display the HTML
- //print("<br/>suffixLeftTerm:".$suffixLeftTerm."<br/>");
- $arrayOfOperands[]=TpToolQueryFilterCombo::retrieveTpBooleanOperand($suffixLeftTerm);
- }
+ //suffix becomes composite by itself
+ //root of common for all controls is:
+ //(ex "0Nested0", "ONested1", "1Nested0" etc...)
+ //(see also "TpToolSearchTemplateBuilder")
+ $tmpIndexer=(string)$indexer.HTML_SEPARATOR_FOR_ASSOCIATION_OF_TERMS.(string)$i;
+ //for left term
+ //(ex "0Nested0Left", "ONested1Left", "1Nested0Left" etc...)
+ $suffixLeftTerm=$tmpIndexer.HTML_NAME_LEFT_TERM_SUFFIX;
+ //right term (for arithemetical ops)
+ //(ex "0Nested0Right", "ONested1Right", "1Nested0Right" etc...)
+ // (currently arithmetical ops are not handled by this class
+ // but can be displayed by "TpToolSearchFilterBuilder.php" and
+ // "TpToolSearchTemplateBuilder.php")
+ $suffixRightTerm=$tmpIndexer.HTML_NAME_RIGHT_TERM_SUFFIX;
+ //call function which display the HTML
+ //print("<br/>suffixLeftTerm:".$suffixLeftTerm."<br/>");
+ $arrayOfOperands[]=TpToolQueryFilterCombo::retrieveTpBooleanOperand($suffixLeftTerm);
+ }
//return instance of TpComaprison
$returnedComparison=TpToolQueryFilterCombo::retrieveTpBooleanExpression($indexer, $arrayOfOperands);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|