[Digir-cvs] SF.net SVN: digir:[2028] tapirlink/trunk/classes

[<rd...@us...>]

Revision: 2028
          http://digir.svn.sourceforge.net/digir/?rev=2028&view=rev
Author:   rdg
Date:     2011-02-02 16:24:44 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
Fixed crash when a literal in a kvp filter is not delimited by double quotes.

Modified Paths:
--------------
    tapirlink/trunk/classes/TpComparisonOperator.php
    tapirlink/trunk/classes/TpInventoryParameters.php
    tapirlink/trunk/classes/TpInventoryResponse.php

Modified: tapirlink/trunk/classes/TpComparisonOperator.php
===================================================================
--- tapirlink/trunk/classes/TpComparisonOperator.php	2010-09-15 00:51:15 UTC (rev 2027)
+++ tapirlink/trunk/classes/TpComparisonOperator.php	2011-02-02 16:24:44 UTC (rev 2028)
@@ -107,8 +107,16 @@
 
             $concept = $r_local_mapping->GetConcept( $concept_id );
 
-            if ( $concept == null or ! $concept->IsMapped() )
+            if ( is_null( $concept ) )
             {
+                $msg = 'Unknown concept "'.$concept_id.'"';
+
+                TpDiagnostics::Append( DC_UNMAPPED_CONCEPT, $msg, DIAG_ERROR );
+
+                return 'FALSE';
+            }
+            else if ( ! $concept->IsMapped() )
+            {
                 // Don't raise error here. If the expression is a missing
                 // parameter then the comparison should be simply discarded
 

Modified: tapirlink/trunk/classes/TpInventoryParameters.php
===================================================================
--- tapirlink/trunk/classes/TpInventoryParameters.php	2010-09-15 00:51:15 UTC (rev 2027)
+++ tapirlink/trunk/classes/TpInventoryParameters.php	2011-02-02 16:24:44 UTC (rev 2028)
@@ -21,7 +21,6 @@
  */
 
 require_once('TpOperationParameters.php');
-require_once('TpFilter.php');
 
 class TpInventoryParameters extends TpOperationParameters
 {

Modified: tapirlink/trunk/classes/TpInventoryResponse.php
===================================================================
--- tapirlink/trunk/classes/TpInventoryResponse.php	2010-09-15 00:51:15 UTC (rev 2027)
+++ tapirlink/trunk/classes/TpInventoryResponse.php	2011-02-02 16:24:44 UTC (rev 2028)
@@ -45,6 +45,8 @@
     {
         global $g_dlog;
 
+	$g_dlog->debug( 'Processing inventory' );
+
         $inventory_parameters = $this->mRequest->GetOperationParameters();
 
         if ( ! is_object( $inventory_parameters ) )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.