From a255d83ebcb9b700a6f30cbcd109d223fc0d98cb Mon Sep 17 00:00:00 2001 From: Ferruccio Guidi Date: Sun, 2 Dec 2012 16:28:54 +0000 Subject: [PATCH] bugfix in uri's: missing "/" added to baseuri's where necessary --- helm/software/helena/Make | 4 ---- helm/software/helena/Makefile | 2 +- helm/software/helena/Makefile.common | 2 +- helm/software/helena/src/common/ccs.ml | 10 +++++----- helm/software/helena/src/common/ccs.mli | 8 ++++---- helm/software/helena/src/common/options.ml | 5 +++-- helm/software/helena/src/xml/xmlLibrary.ml | 8 ++++---- helm/www/lambdadelta/BTM.html | 4 ++-- helm/www/lambdadelta/apps_2.html | 4 ++-- helm/www/lambdadelta/basic_2.html | 4 ++-- helm/www/lambdadelta/documentation.html | 4 ++-- helm/www/lambdadelta/implementation.html | 7 ++++--- helm/www/lambdadelta/index.html | 4 ++-- helm/www/lambdadelta/news.html | 4 ++-- helm/www/lambdadelta/web/home/BTM.ldw.xml | 2 +- helm/www/lambdadelta/web/home/apps_2.ldw.xml | 2 +- helm/www/lambdadelta/web/home/basic_2.ldw.xml | 2 +- helm/www/lambdadelta/xml/ld.dtd | 4 ++-- helm/www/lambdadelta/xslt/ld_web_root.xsl | 2 +- helm/www/lambdadelta/xslt/lddl_entity.xsl | 2 +- helm/www/lambdadelta/xslt/lddl_library.xsl | 2 +- helm/www/lambdadelta/xslt/lddl_root.xsl | 2 +- helm/www/lambdadelta/xslt/lddl_term.xsl | 2 +- 23 files changed, 44 insertions(+), 46 deletions(-) diff --git a/helm/software/helena/Make b/helm/software/helena/Make index f5f4524de..4cfa2519d 100644 --- a/helm/software/helena/Make +++ b/helm/software/helena/Make @@ -2,10 +2,6 @@ Make* README examples/grundlagen/*.aut -icons/*.ico -icons/*.png src/*.ml src/Make* src/*/* -xml/*.dtd -xml/*.xsl diff --git a/helm/software/helena/Makefile b/helm/software/helena/Makefile index 9c1df551f..f943608ea 100644 --- a/helm/software/helena/Makefile +++ b/helm/software/helena/Makefile @@ -14,7 +14,7 @@ TAGS = test-si test-si-fast profile xml-si xml-si-crg include Makefile.common -XMLDIR = $(HOME)/svn/helm-stable/www/lambdadelta +XMLDIR = $(HOME)/svn/helm_stable/www/lambdadelta INPUT = examples/grundlagen/grundlagen.aut diff --git a/helm/software/helena/Makefile.common b/helm/software/helena/Makefile.common index 1fbcd619b..34c521bb6 100644 --- a/helm/software/helena/Makefile.common +++ b/helm/software/helena/Makefile.common @@ -7,7 +7,7 @@ endif RELISE = $(MAIN:%=%_$(shell cat MakeVersion)) -DOWNDIR = $(HOME)/svn/helm-stable/www/lambdadelta/download +DOWNDIR = $(HOME)/svn/helm_stable/www/lambdadelta/download DIRECTORIES = $(addprefix $(SRC)/,$(shell cat $(SRC)/Make)) diff --git a/helm/software/helena/src/common/ccs.ml b/helm/software/helena/src/common/ccs.ml index db8a77865..5364d1e07 100644 --- a/helm/software/helena/src/common/ccs.ml +++ b/helm/software/helena/src/common/ccs.ml @@ -16,10 +16,10 @@ module E = Entity module G = Options type csys = { - uri: E.uri; - mutable tp : int list; - mutable t1 : int list; - mutable tn : (int * int) list; + buri: E.uri; + mutable tp : int list; + mutable t1 : int list; + mutable tn : (int * int) list; } let mark a = E.mark C.err C.start a @@ -27,7 +27,7 @@ let mark a = E.mark C.err C.start a (* interface functions ******************************************************) let init () = { - uri = U.uri_of_string (G.get_baseuri ()); + buri = U.uri_of_string (G.get_baseuri ()); tp = []; t1 = []; tn = [] } diff --git a/helm/software/helena/src/common/ccs.mli b/helm/software/helena/src/common/ccs.mli index 4d11ddd7c..f263d8a08 100644 --- a/helm/software/helena/src/common/ccs.mli +++ b/helm/software/helena/src/common/ccs.mli @@ -10,10 +10,10 @@ V_______________________________________________________________ *) type csys = { - uri: Entity.uri; - mutable tp : int list; - mutable t1 : int list; - mutable tn : (int * int) list; + buri: Entity.uri; + mutable tp : int list; + mutable t1 : int list; + mutable tn : (int * int) list; } val init: unit -> csys diff --git a/helm/software/helena/src/common/options.ml b/helm/software/helena/src/common/options.ml index 8cc200ad9..a2c749872 100644 --- a/helm/software/helena/src/common/options.ml +++ b/helm/software/helena/src/common/options.ml @@ -9,6 +9,7 @@ \ / This software is distributed as is, NO WARRANTY. V_______________________________________________________________ *) +module F = Filename module C = Cps type uri_generator = string -> string @@ -49,11 +50,11 @@ let kernel_id () = id ^ si let get_baseuri () = - String.concat "/" ["ld:"; kernel_id (); !cover ] + String.concat "/" ["ld:"; kernel_id (); !cover; "" ] let get_mk_uri () = let bu = get_baseuri () in - fun s -> bu ^ "/" ^ s ^ ".ld" + fun s -> F.concat bu (s ^ ".ld") let clear () = xdir := ""; kernel := Brg; si := false; cover := ""; diff --git a/helm/software/helena/src/xml/xmlLibrary.ml b/helm/software/helena/src/xml/xmlLibrary.ml index 5ca87bdfd..91225c336 100644 --- a/helm/software/helena/src/xml/xmlLibrary.ml +++ b/helm/software/helena/src/xml/xmlLibrary.ml @@ -30,9 +30,9 @@ let ccs_name = "ccs.ldc" let ccs_root = "CCS" -let home = "http://lambdadelta.info" +let home = "http://lambdadelta.info/" -let system = home ^ "/" ^ base ^ "/ld.dtd" +let system = F.concat (F.concat home base) "ld.dtd" let xmlns = "xmlns", home @@ -177,13 +177,13 @@ let nexts = function | l -> "next", String.concat " " (List.rev_map next_map l) let export_csys s = - let path = path_of_uri !G.xdir s.Q.uri in + let path = path_of_uri !G.xdir s.Q.buri in let _ = Sys.command (Printf.sprintf "mkdir -p %s" path) in let name = F.concat path (ccs_name ^ ext) in let och = open_out name in let out = output_string och in xml out "1.0" "UTF-8"; doctype out ccs_root system; - let attrs = [xmlns; uri s.Q.uri] in + let attrs = [xmlns; uri s.Q.buri] in let contents out tab = tag "ToPositive" [arity s.Q.tp; marks s.Q.tp] out tab; tag "ToOne" [arity s.Q.t1; marks s.Q.t1] out tab; diff --git a/helm/www/lambdadelta/BTM.html b/helm/www/lambdadelta/BTM.html index ec1ba2de0..3d0d75fbf 100644 --- a/helm/www/lambdadelta/BTM.html +++ b/helm/www/lambdadelta/BTM.html @@ -1,6 +1,6 @@ - + @@ -20,6 +20,6 @@
classcontents














p
147101316192225283134374043
q
5111517232933354145




s
268141820242632384244


t
39122127303639






-
[Spacer]

[Valid XHTML 1.1][Valid CSS level 2][Generated from XML via XSL][PNG used here][Viewable with any browser]

Last update: 2012-12-01T17:55:33+01:00
+
[Spacer]

[Valid XHTML 1.1][Valid CSS level 2][Generated from XML via XSL][PNG used here][Viewable with any browser]

Last update: 2012-12-02T17:25:27+01:00
diff --git a/helm/www/lambdadelta/apps_2.html b/helm/www/lambdadelta/apps_2.html index 80c3d45b0..ce05f226b 100644 --- a/helm/www/lambdadelta/apps_2.html +++ b/helm/www/lambdadelta/apps_2.html @@ -1,6 +1,6 @@ - + @@ -57,6 +57,6 @@
The source files are grouped in directories, one for each component.
-
[Spacer]

[Valid XHTML 1.1][Valid CSS level 2][Generated from XML via XSL][PNG used here][Viewable with any browser]

Last update: 2012-12-01T17:55:33+01:00
+
[Spacer]

[Valid XHTML 1.1][Valid CSS level 2][Generated from XML via XSL][PNG used here][Viewable with any browser]

Last update: 2012-12-02T17:25:27+01:00
diff --git a/helm/www/lambdadelta/basic_2.html b/helm/www/lambdadelta/basic_2.html index 8019b44f8..b7988087c 100644 --- a/helm/www/lambdadelta/basic_2.html +++ b/helm/www/lambdadelta/basic_2.html @@ -1,6 +1,6 @@ - + @@ -83,6 +83,6 @@
The source files are grouped in directories, one for each component.
-
[Spacer]

[Valid XHTML 1.1][Valid CSS level 2][Generated from XML via XSL][PNG used here][Viewable with any browser]

Last update: 2012-12-01T17:55:33+01:00
+
[Spacer]

[Valid XHTML 1.1][Valid CSS level 2][Generated from XML via XSL][PNG used here][Viewable with any browser]

Last update: 2012-12-02T17:25:27+01:00
diff --git a/helm/www/lambdadelta/documentation.html b/helm/www/lambdadelta/documentation.html index 425084d70..db35152fb 100644 --- a/helm/www/lambdadelta/documentation.html +++ b/helm/www/lambdadelta/documentation.html @@ -10,7 +10,7 @@

- [Crux Logo] + [Crux Logo]

The Formal System λδ (\lambda\delta)

Towards the unification of terms, types, environments and @@ -299,4 +299,4 @@ Guidi:

- \ No newline at end of file + diff --git a/helm/www/lambdadelta/implementation.html b/helm/www/lambdadelta/implementation.html index e5ecc5760..75a81d02f 100644 --- a/helm/www/lambdadelta/implementation.html +++ b/helm/www/lambdadelta/implementation.html @@ -10,7 +10,7 @@

- [Crux Logo] + [Crux Logo]

The Formal System λδ (\lambda\delta)

Towards the unification of terms, types, environments and @@ -130,7 +130,8 @@ Formal
    @@ -250,4 +251,4 @@ computer Guidi

- \ No newline at end of file + diff --git a/helm/www/lambdadelta/index.html b/helm/www/lambdadelta/index.html index 45fd133bb..62e31753b 100644 --- a/helm/www/lambdadelta/index.html +++ b/helm/www/lambdadelta/index.html @@ -10,7 +10,7 @@

-[Crux Logo] +[Crux Logo]

The Formal System λδ (\lambda\delta)

Towards the unification of terms, types, environments and contexts

@@ -142,4 +142,4 @@ Last update 2012-12-02 by Ferruccio Guidi
- \ No newline at end of file + diff --git a/helm/www/lambdadelta/news.html b/helm/www/lambdadelta/news.html index 1c2054123..915d3193d 100644 --- a/helm/www/lambdadelta/news.html +++ b/helm/www/lambdadelta/news.html @@ -9,7 +9,7 @@

-[Crux Logo] +[Crux Logo]

The Formal System λδ (\lambda\delta)

Towards the unification of terms, types, environments and contexts

@@ -230,4 +230,4 @@ Last update 2012-12-02 by Ferruccio Guidi
- \ No newline at end of file + diff --git a/helm/www/lambdadelta/web/home/BTM.ldw.xml b/helm/www/lambdadelta/web/home/BTM.ldw.xml index 63f49585e..32ee158a1 100644 --- a/helm/www/lambdadelta/web/home/BTM.ldw.xml +++ b/helm/www/lambdadelta/web/home/BTM.ldw.xml @@ -1,6 +1,6 @@ - - - @@ -135,6 +135,6 @@ diff --git a/helm/www/lambdadelta/xslt/ld_web_root.xsl b/helm/www/lambdadelta/xslt/ld_web_root.xsl index 7c0afb538..cfff0d2d7 100644 --- a/helm/www/lambdadelta/xslt/ld_web_root.xsl +++ b/helm/www/lambdadelta/xslt/ld_web_root.xsl @@ -3,7 +3,7 @@ diff --git a/helm/www/lambdadelta/xslt/lddl_entity.xsl b/helm/www/lambdadelta/xslt/lddl_entity.xsl index 99f699d9b..9145173e8 100644 --- a/helm/www/lambdadelta/xslt/lddl_entity.xsl +++ b/helm/www/lambdadelta/xslt/lddl_entity.xsl @@ -12,7 +12,7 @@ V_______________________________________________________________ --> diff --git a/helm/www/lambdadelta/xslt/lddl_library.xsl b/helm/www/lambdadelta/xslt/lddl_library.xsl index e69468a9d..9eccd5b85 100644 --- a/helm/www/lambdadelta/xslt/lddl_library.xsl +++ b/helm/www/lambdadelta/xslt/lddl_library.xsl @@ -12,7 +12,7 @@ V_______________________________________________________________ --> diff --git a/helm/www/lambdadelta/xslt/lddl_root.xsl b/helm/www/lambdadelta/xslt/lddl_root.xsl index ba2dd9028..58bddb0a5 100644 --- a/helm/www/lambdadelta/xslt/lddl_root.xsl +++ b/helm/www/lambdadelta/xslt/lddl_root.xsl @@ -12,7 +12,7 @@ V_______________________________________________________________ --> diff --git a/helm/www/lambdadelta/xslt/lddl_term.xsl b/helm/www/lambdadelta/xslt/lddl_term.xsl index d2cb461a3..01ccff3bb 100644 --- a/helm/www/lambdadelta/xslt/lddl_term.xsl +++ b/helm/www/lambdadelta/xslt/lddl_term.xsl @@ -12,7 +12,7 @@ V_______________________________________________________________ --> -- 2.39.2