fixed issue #3

agocorona · Aug 28, 2013 · 00669bd · 00669bd
1 parent 594f7f3
commit 00669bd
Show file tree

Hide file tree

Showing 78 changed files with 15 additions and 1,641 deletions.
diff --git a/Data/TCache/IndexQuery.hs b/Data/TCache/IndexQuery.hs
@@ -88,7 +88,7 @@ module Data.TCache.IndexQuery(
 where
 
 import Data.TCache
-import Data.TCache.DefaultPersistence
+import Data.TCache.Defs
 import Data.List
 import Data.Typeable
 import Control.Concurrent.STM
@@ -138,7 +138,13 @@ instance (Typeable reg, Typeable a) => Indexable (Index reg a) where
        where
        [typeofreg, typeofa]= typeRepArgs $! typeOf map
 
-   defPath= const ""
+
+
+instance (Queriable reg a, Typeable reg, Typeable a) => IResource (Index reg a) where
+  keyResource = key
+  writeResource =defWriteResource
+  readResourceByKey = defReadResourceByKey
+  delResource = defDelResource
 
 getIndex :: (Queriable reg a)
    => ( reg -> a) -> a -> STM(DBRef (Index reg a), Index reg a,[DBRef reg])
@@ -162,7 +168,7 @@ getIndexr rindex val= do
    return (rindex, Index index, dbrefs)
 
 selectorIndex
-  :: (Queriable reg a
+  :: (Queriable reg a, IResource reg
       ) =>
      (reg -> a) -> DBRef (Index reg a) -> DBRef reg -> Maybe reg -> STM ()
 

diff --git a/Data/TCache/IndexText.hs b/Data/TCache/IndexText.hs
@@ -62,7 +62,7 @@ module Data.TCache.IndexText(
 , allElemsOf) where
 import Data.TCache
 import Data.TCache.IndexQuery
-import Data.TCache.DefaultPersistence
+import Data.TCache.Defs
 import qualified Data.Text.Lazy as T
 import Data.Typeable
 import qualified Data.Map as M
@@ -102,11 +102,11 @@ instance Serializable IndexText  where
 instance  Indexable IndexText  where
    key (IndexText v _ _ _ _)=    "indextext " ++ v
 
---instance IResource IndexText where
---  keyResource = key
---  writeResource =defWriteResource
---  readResourceByKey = defReadResourceByKey
---  delResource = defDelResource
+instance IResource IndexText where
+  keyResource = key
+  writeResource =defWriteResource
+  readResourceByKey = defReadResourceByKey
+  delResource = defDelResource
 
 readInitDBRef v x= do
   mv <- readDBRef x

diff --git a/dist/TCache-0.10.0.0.tar.gz b/dist/TCache-0.10.0.0.tar.gz
diff --git a/dist/TCache-0.10.0.1.tar.gz b/dist/TCache-0.10.0.1.tar.gz
diff --git a/dist/TCache-0.10.0.11.tar.gz b/dist/TCache-0.10.0.11.tar.gz
diff --git a/dist/TCache-0.10.0.12.tar.gz b/dist/TCache-0.10.0.12.tar.gz
diff --git a/dist/TCache-0.10.0.2.tar.gz b/dist/TCache-0.10.0.2.tar.gz
diff --git a/dist/TCache-0.10.1.0.tar.gz b/dist/TCache-0.10.1.0.tar.gz
diff --git a/dist/build/Data/Persistent/Collection.hi b/dist/build/Data/Persistent/Collection.hi
diff --git a/dist/build/Data/Persistent/Collection.o b/dist/build/Data/Persistent/Collection.o
diff --git a/dist/build/Data/Persistent/IDynamic.hi b/dist/build/Data/Persistent/IDynamic.hi
diff --git a/dist/build/Data/Persistent/IDynamic.o b/dist/build/Data/Persistent/IDynamic.o
diff --git a/dist/build/Data/TCache.hi b/dist/build/Data/TCache.hi
diff --git a/dist/build/Data/TCache.o b/dist/build/Data/TCache.o
diff --git a/dist/build/Data/TCache/DefaultPersistence.hi b/dist/build/Data/TCache/DefaultPersistence.hi
diff --git a/dist/build/Data/TCache/DefaultPersistence.o b/dist/build/Data/TCache/DefaultPersistence.o
diff --git a/dist/build/Data/TCache/Defs.hi b/dist/build/Data/TCache/Defs.hi
diff --git a/dist/build/Data/TCache/Defs.o b/dist/build/Data/TCache/Defs.o
diff --git a/dist/build/Data/TCache/IResource.hi b/dist/build/Data/TCache/IResource.hi
diff --git a/dist/build/Data/TCache/IResource.o b/dist/build/Data/TCache/IResource.o
diff --git a/dist/build/Data/TCache/IndexQuery.hi b/dist/build/Data/TCache/IndexQuery.hi
diff --git a/dist/build/Data/TCache/IndexQuery.o b/dist/build/Data/TCache/IndexQuery.o
diff --git a/dist/build/Data/TCache/IndexText.hi b/dist/build/Data/TCache/IndexText.hi
diff --git a/dist/build/Data/TCache/IndexText.o b/dist/build/Data/TCache/IndexText.o
diff --git a/dist/build/Data/TCache/Memoization.hi b/dist/build/Data/TCache/Memoization.hi
diff --git a/dist/build/Data/TCache/Memoization.o b/dist/build/Data/TCache/Memoization.o
diff --git a/dist/build/Data/TCache/Triggers.hi b/dist/build/Data/TCache/Triggers.hi
diff --git a/dist/build/Data/TCache/Triggers.o b/dist/build/Data/TCache/Triggers.o
diff --git a/dist/build/HSTCache-0.10.0.0.o b/dist/build/HSTCache-0.10.0.0.o
diff --git a/dist/build/HSTCache-0.10.0.1.o b/dist/build/HSTCache-0.10.0.1.o
diff --git a/dist/build/HSTCache-0.10.0.10.o b/dist/build/HSTCache-0.10.0.10.o
diff --git a/dist/build/HSTCache-0.10.0.11.o b/dist/build/HSTCache-0.10.0.11.o
diff --git a/dist/build/HSTCache-0.10.0.12.o b/dist/build/HSTCache-0.10.0.12.o
diff --git a/dist/build/HSTCache-0.10.1.0.o b/dist/build/HSTCache-0.10.1.0.o
diff --git a/dist/build/HSTCache-0.9.0.4.o b/dist/build/HSTCache-0.9.0.4.o
diff --git a/dist/build/autogen/Paths_TCache.hs b/dist/build/autogen/Paths_TCache.hs
diff --git a/dist/build/autogen/cabal_macros.h b/dist/build/autogen/cabal_macros.h
diff --git a/dist/build/libHSTCache-0.10.0.0.a b/dist/build/libHSTCache-0.10.0.0.a
diff --git a/dist/build/libHSTCache-0.10.0.1.a b/dist/build/libHSTCache-0.10.0.1.a
diff --git a/dist/build/libHSTCache-0.10.0.10.a b/dist/build/libHSTCache-0.10.0.10.a
diff --git a/dist/build/libHSTCache-0.10.0.11.a b/dist/build/libHSTCache-0.10.0.11.a
diff --git a/dist/build/libHSTCache-0.10.0.12.a b/dist/build/libHSTCache-0.10.0.12.a
diff --git a/dist/build/libHSTCache-0.10.1.0.a b/dist/build/libHSTCache-0.10.1.0.a
diff --git a/dist/build/libHSTCache-0.9.0.4.a b/dist/build/libHSTCache-0.9.0.4.a
diff --git a/dist/build/sta01016 b/dist/build/sta01016
diff --git a/dist/build/sta05348 b/dist/build/sta05348
diff --git a/dist/build/sta06068 b/dist/build/sta06068