\ / This software is distributed as is, NO WARRANTY.
V_______________________________________________________________ *)
-module U = NUri
-module L = Log
-module K = U.UriHash
-module E = Entity
-module Z = Bag
+module U = NUri
+module UH = U.UriHash
+module L = Log
+module G = Options
+module E = Entity
+module Z = Bag
+
+IFDEF TYPE THEN
exception ObjectNotFound of Z.message
-let hsize = 7000
-let env = K.create hsize
+let hsize = 7000
+let env = UH.create hsize
(* Internal functions *******************************************************)
-let get_age =
- let age = ref 0 in
- fun () -> incr age; !age
-
let error uri = raise (ObjectNotFound (L.items1 (U.string_of_uri uri)))
(* Interface functions ******************************************************)
-let set_entity f (a, uri, b) =
- let age = get_age () in
- let entry = (E.Apix age :: a), uri, b in
- K.add env uri entry; f entry
+let set_entity f entity =
+IFDEF EXPAND THEN
+ let ra, na, uri, b = entity in
+ let entity0 = if !G.expand then ra, E.node_attrs ~apix:0 (), uri, b else entity in
+ UH.add env uri entity0; f entity
+ELSE
+ let _, _, uri, _ = entity in
+ UH.add env uri entity; f entity
+END
let get_entity f uri =
- try f (K.find env uri) with Not_found -> error uri
+ try f (UH.find env uri) with Not_found -> error uri
+
+END