From 985f0f90f5b5dc2b03a8de589bc348c18c00f38f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sebastian=20Skej=C3=B8?= <sebastian@sebastian.localdomain>
Date: Sun, 14 Jun 2009 12:48:05 +0200
Subject: [PATCH] AOOSCore: Modified to fit refactored AOOSModel.

---
 AOOSCore.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/AOOSCore.php b/AOOSCore.php
index 5df65ad..a472ed8 100644
--- a/AOOSCore.php
+++ b/AOOSCore.php
@@ -50,16 +50,16 @@ class AOOSCore
             AOOSMODEL_PROP_FROM_DATABASE|
             AOOSMODEL_PROP_UNIQUE|
             AOOSMODEL_PROP_DATA_INCREASING);*/
-        $m->setProperty("NAME",
-            AOOSMODEL_TYPE_STRING,
-            AOOSMODEL_PROP_FROM_DATABASE);
-        $m->setProperty("DEPS",
-            AOOSMODEL_TYPE_STRING,
-            AOOSMODEL_PROP_FROM_DATABASE);
-        $m->setProperty("INSTANCE",
-            AOOSMODEL_TYPE_UNKNOWN,0);
-        $m->setTable($this->getSetting("module_table"));
+        $m->setProperties("NAME",
+            AOOSMODEL_TYPE_STRING, 0,
+            AOOSMODEL_FLAG_FROM_DATABASE);
+        $m->setProperties("DEPS",
+            AOOSMODEL_TYPE_STRING, 0,
+            AOOSMODEL_FLAG_FROM_DATABASE);
+        $m->setProperties("INSTANCE",
+            AOOSMODEL_TYPE_UNKNOWN);
         $m->setSource($this->getSetting("default_storage_type"));
+        $m->setTable($this->getSetting("module_table"));
         try {
             $m->populate();
         } catch (AOOSException $e) {
@@ -181,7 +181,7 @@ class AOOSCore
             throw new AOOSException($this, $this->getTranslatedString("unknown_module"), $module);
             return false;
         }
-        $deps = AOOSModel::stripQuotes($row["DEPS"]);
+        $deps = $row->DEPS;
         if ($deps != "") {
             foreach (explode(",",$deps) as $dep) {
                 if (!$this->getModule($dep)) {
@@ -205,7 +205,7 @@ class AOOSCore
             $i->dataModel()->setSource($this->getSetting("default_storage_type"));
             $i->dataModel()->setTable($module);
         }
-        $m->setDataRowSingle($row, "INSTANCE", $i);
+        $row->INSTANCE = $i;
         $i->setName($module);
 
         $sf = $dir."settings".$this->getSetting("extension");
-- 
2.11.4.GIT