[ObjectHandler-cvs] ObjectHandler/ohxl objecthandlerxl.cpp, 1.17, 1.18 objecthandlerxl.hpp, 1.15, 1.16

[Eric E. <eri...@us...>]

Update of /cvsroot/objecthandler/ObjectHandler/ohxl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19553/ohxl

Modified Files:
	objecthandlerxl.cpp objecthandlerxl.hpp 
Log Message:
convert object IDs to upper case

Index: objecthandlerxl.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/objecthandlerxl.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** objecthandlerxl.cpp	20 Sep 2006 20:17:07 -0000	1.17
--- objecthandlerxl.cpp	26 Oct 2006 10:14:41 -0000	1.18
***************
*** 102,106 ****
      }
  
!     void ObjectHandlerXL::resetCaller(bool createIfNone) {
          if (FunctionCall::instance().getCallerType() != Cell)
              return;
--- 102,106 ----
      }
  
!     void ObjectHandlerXL::resetCaller(const bool &createIfNone) {
          if (FunctionCall::instance().getCallerType() != Cell)
              return;
***************
*** 110,119 ****
  
      std::string ObjectHandlerXL::storeObject(
!             std::string objectID,
              const boost::shared_ptr<Object> &object) {
  
!         if (objectID.empty()) {
              objectID = generateObjectID();
              object->setAnonymous();
          }
  
--- 110,122 ----
  
      std::string ObjectHandlerXL::storeObject(
!             const std::string &objectIDOrig,
              const boost::shared_ptr<Object> &object) {
  
!         std::string objectID;
!         if (objectIDOrig.empty()) {
              objectID = generateObjectID();
              object->setAnonymous();
+         } else {
+             objectID = objectIDOrig;
          }
  
***************
*** 164,168 ****
          }
          std::ostringstream s;
!         s << "obj_" << std::setw(COUNT_WIDTH) << std::setfill('0') << std::setbase(COUNT_BASE) << objectIDCount_++;
          return s.str();
      }
--- 167,171 ----
          }
          std::ostringstream s;
!         s << "OBJ_" << std::setw(COUNT_WIDTH) << std::setfill('0') << std::setbase(COUNT_BASE) << objectIDCount_++;
          return s.str();
      }

Index: objecthandlerxl.hpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/objecthandlerxl.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** objecthandlerxl.hpp	4 Oct 2006 09:37:43 -0000	1.15
--- objecthandlerxl.hpp	26 Oct 2006 10:14:41 -0000	1.16
***************
*** 54,58 ****
              Performance in such special cases is sub-optimal.
          */
!         virtual std::string storeObject(std::string objectID, 
                                          const boost::shared_ptr<Object> &object);
          virtual boost::shared_ptr<Object> retrieveObjectImpl(const std::string &objectID) const;
--- 54,58 ----
              Performance in such special cases is sub-optimal.
          */
!         virtual std::string storeObject(const std::string &objectID, 
                                          const boost::shared_ptr<Object> &object);
          virtual boost::shared_ptr<Object> retrieveObjectImpl(const std::string &objectID) const;
***************
*** 65,69 ****
              which set the caller's status to "busy".
          */
!         virtual void resetCaller(bool createIfNone = false);
  
          virtual void dump(std::ostream&);
--- 65,69 ----
              which set the caller's status to "busy".
          */
!         virtual void resetCaller(const bool &createIfNone = false);
  
          virtual void dump(std::ostream&);