(est-eval-journal-volume): Use `year' feature of `published/date'

object.

diff --git a/est-eval.el b/est-eval.el
index a99bb10..54e1d14 100644 (file)
--- a/est-eval.el
+++ b/est-eval.el
@@ -16,14 +16,14 @@
        ((eq spec 06) (concat value "&GT-56392;"))
        ((eq spec 07) (concat value "輯"))
        ((eq spec 08) (concat value "&GT-53119;"))
-       ((eq spec 09) (concat value "&GT-53119;分󠄀"))
+       ((eq spec 09) (concat value "&GT-53119;&AJ1-03580;"))
        ((eq spec 10) (concat value "冊"))
-       ((eq spec 11) (concat value "分󠄀冊"))
+       ((eq spec 11) (concat value "&AJ1-03580;冊"))
        ((eq spec 12) (concat value "&J90-3C21;"))
        ((eq spec 13) (concat value "&GT-18140;号"))
        ((eq spec 14) (concat value "特&GT-56392;号"))
        ((eq spec 15) (concat value "本"))
-       ((eq spec 16) (concat value "分󠄀"))
+       ((eq spec 16) (concat value "&AJ1-03580;"))
        ((eq spec 51) (concat "Vol." value))
        ((eq spec 52) (concat "No." value))
        ((eq spec 53) (concat "Part " value))
@@ -76,14 +76,14 @@
 ;;         ((string= spec "06") `((decimal (:feature ,feature)) "&GT-56392;"))
 ;;         ((string= spec "07") `((decimal (:feature ,feature)) "輯"))
 ;;         ((string= spec "08") `((decimal (:feature ,feature)) "&GT-53119;"))
-;;         ((string= spec "09") `((decimal (:feature ,feature)) "&GT-53119;分󠄀"))
+;;         ((string= spec "09") `((decimal (:feature ,feature)) "&GT-53119;&AJ1-03580;"))
 ;;         ((string= spec "10") `((decimal (:feature ,feature)) "冊"))
-;;         ((string= spec "11") `((decimal (:feature ,feature)) "分󠄀冊"))
+;;         ((string= spec "11") `((decimal (:feature ,feature)) "&AJ1-03580;冊"))
 ;;         ((string= spec "12") `((decimal (:feature ,feature)) "&J90-3C21;"))
 ;;         ((string= spec "13") `((decimal (:feature ,feature)) "&GT-18140;号"))
 ;;         ((string= spec "14") `((decimal (:feature ,feature)) "特&GT-56392;号"))
 ;;         ((string= spec "15") `((decimal (:feature ,feature)) "本"))
-;;         ((string= spec "16") `((decimal (:feature ,feature)) "分󠄀"))
+;;         ((string= spec "16") `((decimal (:feature ,feature)) "&AJ1-03580;"))
 ;;         ((string= spec "51") `("Vol." ((decimal (:feature ,feature)))))
 ;;         ((string= spec "52") `("No." ((decimal (:feature ,feature)))))
 ;;         ((string= spec "53") `("Part " ((decimal (:feature ,feature)))))
@@ -109,7 +109,9 @@
        year)
     (setq volume-type (concord-object-get journal 'volume/type/code)
          number-type (concord-object-get journal 'number/type/code))
-    (setq year (concord-object-get value '->published/date*year))
+    (setq year (or (concord-object-get value '->published/date*year)
+                  (concord-object-get
+                   (car (concord-object-get value 'published/date)) 'year)))
     ;; (append (list (concord-object-get journal 'name))
     ;;         (est-journal-volume-object-get-volume-format
     ;;          volume-type '<-volume*volume)