[fix] opadoc: fix for files node

gaetan-sumup · Oct 25, 2011 · 03210d5 · 03210d5
1 parent e93e2a5
commit 03210d5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/opadoc/common/opaDocComment.opa b/opadoc/common/opaDocComment.opa
@@ -265,16 +265,7 @@ OpaDocComment =
       content = file_content(fname)
 
       //do jlog(fname)
-      len = String.length(fname)
+      fname = OpaDocUtils.relative_path(fname)
-      path = "_build/" // FIXME: VERY specific to build !!!
-      path_len = String.length(path)
-      fname = match String.index(path, fname)
-              {some=idx} ->
-                match String.get_suffix(len-idx-path_len, fname)
-                {some=s} -> s
-                {none} -> fname
-                end
-              {none} -> fname
 
       match Parser.parse(private.extract, content) with
       | [] -> []

diff --git a/opadoc/common/opaDocUtils.opa b/opadoc/common/opaDocUtils.opa
@@ -98,4 +98,19 @@ OpaDocUtils = {{
     then String.replace(File.dir_sep, ".", p)
     else legacy_uri_of_path(p)
 
+  relative_path(fname) =
+    if not(OpaDocParameters.get().long_uris)
+    then fname
+    else
+      len = String.length(fname)
+      path = "_build/" // FIXME: VERY specific to build !!!
+      path_len = String.length(path)
+      match String.index(path, fname)
+      {some=idx} ->
+        match String.get_suffix(len-idx-path_len, fname)
+        {some=s} -> s
+        {none} -> fname
+        end
+      {none} -> fname
+
 }}
diff --git a/opadoc/generator/opaDocTree.opa b/opadoc/generator/opaDocTree.opa
@@ -280,6 +280,7 @@ OpaDocTree = {{
 
   of_files(files) =
     aux(acc, path) =
+      path = OpaDocUtils.relative_path(path)
       key  = {file = path}
       path_dot = OpaDocUtils.uri_of_path(path)
       node = {