- simpler attribute system

[helm.git] / helm / software / helena / src / basic_ag / bagEnvironment.ml

diff --git a/helm/software/helena/src/basic_ag/bagEnvironment.ml b/helm/software/helena/src/basic_ag/bagEnvironment.ml
index 61e823836a899e2f20a9d20e39336231ab93b2e4..3f2b5534d96aa601d57b8db00399ec0ccb88e79a 100644 (file)
--- a/helm/software/helena/src/basic_ag/bagEnvironment.ml
+++ b/helm/software/helena/src/basic_ag/bagEnvironment.ml
@@ -12,28 +12,30 @@
 module U  = NUri
 module UH = U.UriHash
 module L  = Log
+module G  = Options
 module E  = Entity
 module Z  = Bag
 
 exception ObjectNotFound of Z.message
 
-let hsize = 7000 
+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 (ra, na, uri, b) =
-   let age = get_age () in
-   let entry = ra, {na with E.n_apix = age}, uri, b in
-   UH.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 (UH.find env uri) with Not_found -> error uri