Changeset 63 for php/trunk/classes/rdfa_Data.php

Timestamp:

Jul 19, 2011, 6:20:58 PM (14 years ago)

Author:

cla

Message:

rdfint

• optimized Data::query, now testing properties before creating Projections

File:

• php/trunk/classes/rdfa_Data.php (modified) (4 diffs)

php/trunk/classes/rdfa_Data.php

@@ -952 +952 @@
 
   // --------------------------------------------------------
-  
+
   /**
    * Retrieves a list of Projections based on a set of selection criteria.
@@ -995 +995 @@
       return false;
 
-    // create projections for examination
+    // examine properties
     $aprojection_test = array();
     $count = count( $asubjects);
-    if ($fLogMessages) $this->debugger->sendMessage( "Getting $count projections for filter test",
+    if ($fLogMessages) $this->debugger->sendMessage( "Testing $count subjects",
                                                      self::debugcontext);
+    $aFilteredSubjects = array();
     foreach ($asubjects as $subject) {
-      $aprojection_test[] = new \rdfa\Projection( $this, $subject, $template);
       $debugmessage .= "$subject\n";
-    }
-
-    // determine which projections have to be filtered out
-    $aFilteredSubjects = array();
-    foreach ($aprojection_test as $projection) {
-      $subject = $projection->getSubject();
       foreach ($query as $property => $value) {
-        $avalues = $projection->getAll( $property);
+        $avalues = $this->getValues( $subject, $property);
         if ($avalues == false) {
-          // filter this projection: property not found
+          // filter this subject: property not found
           $aFilteredSubjects[ $subject] = "Property $property not found";
           break;
@@ -1024 +1018 @@
       }
     }
+
     $count = count( $aFilteredSubjects);
     if ($count == 0) {
       $debugmessage = "No projections filtered\n";
     } else {
-      $debugmessage = "Filtering $count projections\n";
+      $debugmessage = "Filtering $count subjects\n";
       foreach ( $aFilteredSubjects as $subject => $reason) {
         $debugmessage .= "$subject: $reason\n";
@@ -1039 +1034 @@
     // take over unfiltered projections
     $aprojection = array();
-    foreach ($aprojection_test as $projection) {
-      if (array_key_exists( $projection->getSubject(), $aFilteredSubjects) === false) {
-        $aprojection[] = $projection;
-      } else {
-        unset( $projection);
-      }
-    }
-
-    // create log output
+    foreach ($asubjects as $subject) {
+      if (array_key_exists( $subject, $aFilteredSubjects) === false)
+        $aprojection[] = new \rdfa\Projection( $this, $subject, $template);
+    }
+
+    // create projections on unfiltered subjects
+    foreach ($aprojection as $projection) {
+      $debugmessage .= "{$projection->getSubject()}\n";
+    }
     $count = count( $aprojection);
     $debugmessage =  "Returning $count projections \n";
-    foreach ($aprojection as $projection) {
-      $debugmessage .= "{$projection->getSubject()}\n";
-    }
+
     if ($fLogMessages) $this->debugger->sendMessage( "$debugmessage",
                                                 self::debugcontext);