[Mulgara-svn] r266 - branches/mgr-58/src/jar/resolver/java/org/mulgara/resolver

[andrae at mulgara.org]

Author: andrae
Date: 2007-05-07 03:22:37 -0500 (Mon, 07 May 2007)
New Revision: 266

Modified:
   branches/mgr-58/src/jar/resolver/java/org/mulgara/resolver/DatabaseOperationContext.java
   branches/mgr-58/src/jar/resolver/java/org/mulgara/resolver/QueryOperation.java
Log:
Minor refactoring of DatabaseOperationContext.

Removing doModify() (deadcode), and initial steps to moving doQuery into
QueryOperation.



Modified: branches/mgr-58/src/jar/resolver/java/org/mulgara/resolver/DatabaseOperationContext.java
===================================================================
--- branches/mgr-58/src/jar/resolver/java/org/mulgara/resolver/DatabaseOperationContext.java	2007-05-07 04:13:08 UTC (rev 265)
+++ branches/mgr-58/src/jar/resolver/java/org/mulgara/resolver/DatabaseOperationContext.java	2007-05-07 08:22:37 UTC (rev 266)
@@ -792,38 +792,9 @@
     }
   }
 
-  protected void doModify(URI modelURI, Statements statements, boolean insert) throws Throwable {
-    long model = systemResolver.localize(new URIReferenceImpl(modelURI));
-    model = getCanonicalModel(model);
 
-    // Make sure security adapters are satisfied
-    for (Iterator i = securityAdapterList.iterator(); i.hasNext(); ) {
-      SecurityAdapter securityAdapter = (SecurityAdapter) i.next();
-
-      // Lie to the user
-      if (!securityAdapter.canSeeModel(model, systemResolver)) {
-        throw new QueryException("No such model " + modelURI);
-      }
-
-      // Tell the truth to the user
-      if (!securityAdapter.canModifyModel(model, systemResolver)) {
-        throw new QueryException("You aren't allowed to modify " + modelURI);
-      }
-    }
-
-    // Obtain a resolver for the destination model type
-    Resolver resolver = obtainResolver(findModelResolverFactory(model));
-    assert resolver != null;
-
-    if (logger.isDebugEnabled()) {
-      logger.debug("Modifying " + modelURI + " using " + resolver);
-    }
-
-    resolver.modifyModel(model, statements, insert);
-
-    if (logger.isDebugEnabled()) {
-      logger.debug("Modified " + modelURI);
-    }
+  public Answer registerAnswer(Answer answer) throws TuplesException {
+    return new TransactionalAnswer(transaction, answer);
   }
 
   public Answer doQuery(Query query) throws Exception

Modified: branches/mgr-58/src/jar/resolver/java/org/mulgara/resolver/QueryOperation.java
===================================================================
--- branches/mgr-58/src/jar/resolver/java/org/mulgara/resolver/QueryOperation.java	2007-05-07 04:13:08 UTC (rev 265)
+++ branches/mgr-58/src/jar/resolver/java/org/mulgara/resolver/QueryOperation.java	2007-05-07 08:22:37 UTC (rev 266)
@@ -203,4 +203,23 @@
 
     return answerList;
   }
+
+/**
+  Answer doQuery(Query query) throws Exception
+  {
+
+    LocalQuery localQuery = new LocalQuery(query, systemResolver, operationContext);
+
+    operationContext.transform(localQuery);
+
+    Tuples tuples = localQuery.resolve();
+    Answer result = operationContext.registerAnswer(
+        new SubqueryAnswer(this, systemResolver, tuples, query.getVariableList()));
+    tuples.close();
+
+    localQuery.close();
+
+    return result;
+  }
+*/
 }