[jenkinscat-docs] master: Change logic used to read info about middleware books. (af9fa04)

[immanetize at fedoraproject.org]

Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git

On branch  : master

>---------------------------------------------------------------

commit af9fa040fb128edd9b30e0e5b6349f54bed288a7
Author: Pavel Tisnovsky <ptisnovs at redhat.com>
Date:   Fri Dec 19 16:37:13 2014 +0100

    Change logic used to read info about middleware books.


>---------------------------------------------------------------

 ChangeLog                 |    5 +++++
 src/jenkinscat/server.clj |   29 ++++++++++++++++-------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b2ab836..707f7b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-12-19  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
+	* src/jenkinscat/server.clj:
+	Change logic used to read info about middleware books.
+
+2014-12-19  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
 	* src/jenkinscat/fileutils.clj:
 	* src/jenkinscat/server.clj:
 	Updated to call functions from proper modules.
diff --git a/src/jenkinscat/server.clj b/src/jenkinscat/server.clj
index 10377d6..58e3836 100644
--- a/src/jenkinscat/server.clj
+++ b/src/jenkinscat/server.clj
@@ -113,17 +113,17 @@
           :else                    (str config/jobs-href-prefix job-name "%20(html-single)/lastStableBuild/artifact/tmp/en-US/html-single/index.html")))
     ;(str "<a href='" config/jobs-href-prefix job-name "%20(html-single)/lastStableBuild/artifact/tmp/en-US/html-single/index.html'>link</a>"))
 
-(defn href-to-file-middleware
-    [job-name-prefix job-name-postfix extension]
-    (str config/jobs-href-prefix job-name-prefix "/lastStableBuild/artifact/output/" job-name-postfix "/" job-name-postfix "." extension))
-
 (defn href-to-pdf-middleware
-    [job-name-prefix job-name-postfix]
-    (href-to-file-middleware job-name-prefix job-name-postfix "pdf"))
+    [job-name job-name-postfix]
+    (let [directory (fileutils/new-file (str config/jobs-dir-prefix job-name "/lastStable/archive/publican/" job-name-postfix "/tmp/en-US/pdf/"))
+          filelist  (.listFiles directory)]
+        (if (<= 1 (count filelist))
+           (str config/jobs-href-prefix job-name  "/lastStableBuild/artifact/publican/" job-name-postfix "/tmp/en-US/pdf/" (.getName (first filelist)))
+           nil)))
 
 (defn href-to-single-html-middleware
     [job-name-prefix job-name-postfix]
-    (href-to-file-middleware job-name-prefix job-name-postfix "html"))
+    (str config/jobs-href-prefix job-name-prefix "/lastStableBuild/artifact/publican/" job-name-postfix "/tmp/en-US/html-single/index.html"))
 
 (defn pdf-exists?
     "Test for existence of PDF file(s) generated by Jenkins."
@@ -201,7 +201,9 @@
     [job-name extension]
     (let [job-name-prefix  (get-job-name-prefix job-name)
           job-name-postfix (get-job-name-postfix job-name)
-          path-to-file     (str config/jobs-dir-prefix job-name-prefix "/lastStable/archive/output/" job-name-postfix "/" job-name-postfix "." extension)]
+          path-to-file     (if (= extension "html")
+                               (str config/jobs-dir-prefix job-name-prefix "/lastStable/archive/publican/" job-name-postfix "/tmp/en-US/html-single/index.html")
+                               (str config/jobs-dir-prefix job-name-prefix "/lastStable/archive/publican/" job-name-postfix "/tmp/en-US/pdf/" name ".pdf"))]
         path-to-file))
 
 (defn get-path-to-middleware-job-html
@@ -213,16 +215,17 @@
     (get-path-to-middleware-job job-name "pdf"))
 
 (defn pdf-exists-middleware-job?
-    [job-name]
-    (let [path-to-html (get-path-to-middleware-job-pdf job-name)
-          file (fileutils/new-file path-to-html)]
-        (.isFile file)))
+    "Test for existence of PDF file(s) generated by Jenkins."
+    [job-name job-name-postfix]
+    (let [directory (fileutils/new-file (str config/jobs-dir-prefix job-name "/lastStable/archive/publican/" job-name-postfix "/tmp/en-US/pdf/"))
+          filelist  (.listFiles directory)]
+        (>= 1 (count filelist))))
 
 (defn get-path-to-pdf-middleware-book
     [job-name]
     (let [job-name-prefix  (get-job-name-prefix  job-name)
           job-name-postfix (get-job-name-postfix job-name)]
-        (if (pdf-exists-middleware-job? job-name)
+        (if (pdf-exists-middleware-job? job-name job-name-postfix)
             (href-to-pdf-middleware job-name-prefix job-name-postfix)
             nil)))