Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

[Markos Zaharioudakis]

removed depracated fetchmethod from xmldatamanager

removed depracated fetchmethod from xmldatamanager

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/184518

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'include/zorba/xmldatamanager.h'
--- include/zorba/xmldatamanager.h	2013-08-06 08:41:26 +0000
+++ include/zorba/xmldatamanager.h	2013-09-09 08:53:25 +0000
@@ -186,13 +186,6 @@
       const String& aBaseURI,
       ParseOptions& aOptions) const = 0;
 
-  /** \brief Fetches an resource refered to by the given URI.
-   *
-   * @deprecated this function has been replaced by StaticContext::fetch.
-   */
-  virtual Item
-  fetch(const String& aURI) const = 0;
-
   /** \brief Register a DiagnosticHandler to which errors occuring during the
    * management of documents and collections are reported.
    *

=== modified file 'src/api/xmldatamanagerimpl.cpp'
--- src/api/xmldatamanagerimpl.cpp	2013-08-06 08:41:26 +0000
+++ src/api/xmldatamanagerimpl.cpp	2013-09-09 08:53:25 +0000
@@ -110,7 +110,6 @@
   Zorba_CompilerHints_t lHints;
   std::ostringstream lProlog;
   lProlog
-    << "import module namespace d = '" << static_context::ZORBA_FETCH_FN_NS  << "';"
     << "import module namespace x = '" << static_context::ZORBA_XML_FN_NS << "';"
     << "import schema namespace opt = '" << static_context::ZORBA_XML_FN_OPTIONS_NS << "';";
 
@@ -355,33 +354,6 @@
 /*******************************************************************************
 
 ********************************************************************************/
-Item XmlDataManagerImpl::fetch(const String& aURI) const
-{
-  ZORBA_DM_TRY
-  {
-    Item lQName = theFactory->createQName(static_context::ZORBA_FETCH_FN_NS,
-                                          "content");
-
-    // create a streamable string item
-    std::vector<ItemSequence_t> lArgs;
-    lArgs.push_back(
-    new SingletonItemSequence(theFactory->createString(aURI)));
-
-    ItemSequence_t lSeq = theContext->invoke(lQName, lArgs);
-    Iterator_t lIter = lSeq->getIterator();
-    lIter->open();
-    Item lRes;
-    lIter->next(lRes);
-    return lRes;
-  }
-  ZORBA_DM_CATCH
-  return 0;
-}
-
-
-/*******************************************************************************
-
-********************************************************************************/
 void XmlDataManagerImpl::registerDiagnosticHandler(DiagnosticHandler* aDiagnosticHandler)
 {
   theContext = new StaticContextImpl(aDiagnosticHandler);

=== modified file 'src/api/xmldatamanagerimpl.h'
--- src/api/xmldatamanagerimpl.h	2013-08-06 08:41:26 +0000
+++ src/api/xmldatamanagerimpl.h	2013-09-09 08:53:25 +0000
@@ -85,8 +85,6 @@
       const String& aBaseURI,
       ParseOptions& aOptions) const;
 
-  Item fetch(const String& aURI) const;
-
   void registerDiagnosticHandler(DiagnosticHandler* aDiagnosticHandler);
 
 #ifndef ZORBA_NO_FULL_TEXT

=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp	2013-09-02 20:43:22 +0000
+++ src/context/static_context.cpp	2013-09-09 08:53:25 +0000
@@ -263,7 +263,7 @@
     ar & lURI;
     ar.set_is_temp_field(false);
     ar & dyn_loaded_module;
-    ar & sctx;
+    ar & theSctx;
   }
   else
   {
@@ -275,12 +275,12 @@
     ar & lURI;
     ar.set_is_temp_field(false);
     ar & dyn_loaded_module;
-    ar & sctx;
+    ar & theSctx;
 
     if (dyn_loaded_module)
     {
-      ZORBA_ASSERT(sctx);
-      module = GENV_DYNAMIC_LOADER->getExternalModule(lURI, *sctx);
+      ZORBA_ASSERT(theSctx);
+      module = GENV_DYNAMIC_LOADER->getExternalModule(lURI, *theSctx);
 
       // no way to get the module
       if (!module)
@@ -2951,7 +2951,7 @@
   ctx_module_t modinfo;
   modinfo.module = aModule;
   modinfo.dyn_loaded_module = aDynamicallyLoaded;
-  modinfo.sctx = this;
+  modinfo.theSctx = this;
 
   if (!theExternalModulesMap->insert(uri, modinfo))
   {

=== modified file 'src/context/static_context.h'
--- src/context/static_context.h	2013-08-24 23:38:45 +0000
+++ src/context/static_context.h	2013-09-09 08:53:25 +0000
@@ -473,7 +473,7 @@
   {
     ExternalModule * module;
     bool             dyn_loaded_module;
-    static_context * sctx;
+    static_context * theSctx;
 
   public:
     SERIALIZABLE_CLASS(ctx_module_t)

=== modified file 'src/zorbaserialization/archiver_consts.h'
--- src/zorbaserialization/archiver_consts.h	2013-08-16 13:00:06 +0000
+++ src/zorbaserialization/archiver_consts.h	2013-09-09 08:53:25 +0000
@@ -36,7 +36,7 @@
   serialized when a pointer to it was encountered. In this case, during
   deserialization, the archiver will allocate the obj on the heap and fill-in
   its data members. If the kind is NORMAL, then the obj was serialized when the
-  objitself was encountered (e.g., the object was an embedded data member of
+  object itself was encountered (e.g., the object was an embedded data member of
   another obj, or was residing on the program stack). In this case, during
   deserialization, the object exists already (in an uninitialized state) and a
   reference to it is given to the archiver, which will fill-in the obj's data.