[Planeshift-cvs] CVS: planeshift/src/server cachemanager.cpp,1.51,1.52

[Thomas T. <to...@us...>]

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14226

Modified Files:
	cachemanager.cpp 
Log Message:
Also flattened out the trade tables.  Removed trade pattern table.

Index: cachemanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/cachemanager.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** cachemanager.cpp	30 May 2004 13:11:55 -0000	1.51
--- cachemanager.cpp	11 Jun 2004 00:11:02 -0000	1.52
***************
*** 65,69 ****
      PreloadTradeCombinations();
      PreloadTradeTransformations();
!     PreloadTradeTransformationSkills();
  	PreloadTips();
      PreloadBadWords();
--- 65,69 ----
      PreloadTradeCombinations();
      PreloadTradeTransformations();
! //    PreloadTradeTransformationSkills();
  	PreloadTips();
      PreloadBadWords();
***************
*** 318,321 ****
--- 318,322 ----
  }
  
+ /*
  bool CacheManager::PreloadTradeTransformationSkills()
  {
***************
*** 356,359 ****
--- 357,361 ----
      return NULL;
  }
+ */
  
  psTradePatterns* CacheManager::InstantiateTradePatternByID(unsigned int patternid)
***************
*** 376,379 ****
--- 378,400 ----
  }
  
+ psTradePatterns* CacheManager::InstantiateTradePatternByDesignID(unsigned int designid)
+ {
+     Result result(db->Select("SELECT * from trade_patterns where designItemId=%u",designid));
+     if (!result.IsValid() || result.Count()<1)
+     {
+         Warning3(LOG_CONNECTIONS,"Could not find trade pattern for design id %u.  Error: %s",
+          designid,db->GetLastError());
+         return NULL;
+     }
+     psTradePatterns *patterninfo = new psTradePatterns;
+     if (patterninfo->Load(result[0]))
+         return patterninfo;
+     else
+     {
+         delete patterninfo;
+         return NULL;
+     }
+ }
+ /*
  psTradeDesigns* CacheManager::InstantiateTradeDesignByID(long int designitemid)
  {
***************
*** 394,397 ****
--- 415,419 ----
      }
  }
+ */
  
  psTradeConstraints* CacheManager::InstantiateTradeConstraintsByName(const char *constraint)