/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 61157129

Added by Andreas Müller almost 3 years ago

ID 6115712947d97ab77f78259037c5bd7ffb8c84cd
Parent 4605409b
Child 1c5d9ea6

ref #9326, ref #3764 fix secion in book-section handling and some cleanup in ReferenceDefaultCacheStrategy

         private final static UUID uuid = UUID.fromString("63e669ca-c6be-4a8a-b157-e391c22580f9");
         //article
         public static final String UNDEFINED_JOURNAL = "undefined journal " + UTF8.EN_DASH;
         private static final String afterAuthor = ": ";
         //book
         //(book?) section
         private static final String afterSectionAuthor = ": ";
         private static final String afterInRefAuthor = ", ";  //TODO needs discussion
         //article
         public static final String UNDEFINED_JOURNAL = "undefined journal " + UTF8.EN_DASH;
         //in reference
         private String biblioInSeparator = UTF8.EN_DASH + " In: "; //#9529
         private static String biblioInSeparator = " " + UTF8.EN_DASH + " In: "; //#9529
         private String biblioArticleInSeparator = UTF8.EN_DASH + " "; //#9529
         private String webpageUriSeparator = " "+UTF8.EN_DASH+" ";
         //common
         private static final String blank = " ";
-...
                 result = titleCacheDefaultReference(reference, isNotAbbrev);
+            }
             if (reference.getType() == ReferenceType.WebPage && reference.getUri() != null && !result.contains(reference.getUri().toString())){
                 result = CdmUtils.concat(" "+UTF8.EN_DASH+" ", result, reference.getUri().toString());
                 result = CdmUtils.concat(webpageUriSeparator, result, reference.getUri().toString());
+            }
             if(reference.getAccessed() != null){
                 //TODO still a bit preliminary, also brackets may change in future
-...
         //section, book section or generic with inRef
         private String titleCacheRealInRef(Reference reference, boolean isAbbrev) {
             ReferenceType type = reference.getType();
             Reference inRef = reference.getInReference();
             boolean hasInRef = (inRef != null);
             String inRefAuthorAndTitle;
             //copy from InRefDefaultCacheStrategyBase
             if (inRef != null){
                 String inRefTitle = TitleWithoutYearAndAuthorHelper.getTitleWithoutYearAndAuthor(inRef, isAbbrev, false);
                 TeamOrPersonBase<?> inRefAuthor = inRef.getAuthorship();
                 String authorStr = (inRefAuthor == null)? "" : CdmUtils.getPreferredNonEmptyString(inRefAuthor.getTitleCache(),
                         inRefAuthor.getNomenclaturalTitle(), isAbbrev, trim);
                 inRefAuthorAndTitle = CdmUtils.concat(afterInRefAuthor, authorStr, inRefTitle);
             }else{
                 inRefAuthorAndTitle = String.format("- undefined %s -", getUndefinedLabel(type));
             String inRefPart = getInRefAuthorAndTitle(inRef, reference.getType(), isAbbrev);
             if (inRef != null && !inRef.isArticle()){
                 inRefPart = addInRefPages(inRef, inRefPart);
+            }
             inRefPart = CdmUtils.addTrailingDotIfNotExists(inRefPart);
             inRefPart = biblioInSeparator + inRefPart;
             if (inRef != null && inRef.isBookSection()){
                 String inInRefPart = getInRefAuthorAndTitle(inRef.getInReference(), inRef.getType(), isAbbrev);
                 inInRefPart = CdmUtils.addTrailingDotIfNotExists(inInRefPart);
                 inInRefPart = biblioInSeparator + inInRefPart;
                 inRefPart += inInRefPart;
+            }
             inRefAuthorAndTitle = CdmUtils.addTrailingDotIfNotExists(inRefAuthorAndTitle);
             //in
             String result = biblioInSeparator + inRefAuthorAndTitle;
             //section title
             String title = CdmUtils.getPreferredNonEmptyString(
-...
                 title = title.substring(0, title.length() - 1);
+            }
             //pages
             String pages = getPages(reference);
             if (isNotBlank(pages)){
                 title = CdmUtils.concat(", ", title, pages);
+            }
             title = addInRefPages(reference, title);
             String result;
             if (title.length() > 0){
                 result = title.trim() + "." + blank + result;
                 result = title.trim() + "." + inRefPart;
             }else{
                 result = inRefPart;
+            }
             //section author
-...
             //date
             String dateStr = null;
             VerbatimTimePeriod date = (reference.getDatePublished() != null && ! reference.getDatePublished().isEmpty())? reference.getDatePublished() : null;
             if (date == null && hasInRef && reference.getInReference().getDatePublished() != null && !reference.getInReference().getDatePublished().isEmpty()){
             VerbatimTimePeriod date = reference.hasDatePublished() ? reference.getDatePublished() : null;
             if (date == null && inRef != null && inRef.hasDatePublished()){
                 date = reference.getInReference().getDatePublished();
                 if (date == null && inRef.isSection() && inRef.getInReference() != null && inRef.getInReference().hasDatePublished()){
                     date = inRef.getInReference().getDatePublished();
+                }
+            }
             if (date != null){
                 dateStr = date.getYear();
-...
             String authorAndYear = CdmUtils.concat(" ", authorStr, dateStr);
             String sep = result.startsWith(biblioInSeparator)? " ": afterSectionAuthor;
             String sep = result.startsWith(biblioInSeparator)? "": afterAuthor;
             result = CdmUtils.concat(sep, authorAndYear, result);
             return result;
+        }
         private String addInRefPages(Reference reference, String title) {
             String pages = getPages(reference);
             if (isNotBlank(pages)){
                 title = CdmUtils.concat(", ", title, pages);
+            }
             return title;
+        }
         private String getInRefAuthorAndTitle(Reference inRef, ReferenceType type, boolean isAbbrev) {
             String inRefAuthorAndTitle;
             if (inRef != null){
                 String inRefTitle = TitleWithoutYearAndAuthorHelper.getTitleWithoutYearAndAuthor(inRef, isAbbrev, false);
                 TeamOrPersonBase<?> inRefAuthor = inRef.getAuthorship();
                 String authorStr = (inRefAuthor == null)? "" : CdmUtils.getPreferredNonEmptyString(inRefAuthor.getTitleCache(),
                         inRefAuthor.getNomenclaturalTitle(), isAbbrev, trim);
                 inRefAuthorAndTitle = CdmUtils.concat(afterInRefAuthor, authorStr, inRefTitle);
             }else{
                 inRefAuthorAndTitle = String.format("- undefined %s -", getUndefinedLabel(type));
+            }
             return inRefAuthorAndTitle;
+        }
         private static final String pageNoRe = "[0-9iIvVxXlLcCdDmM]+";
         private String getPages(Reference reference) {
             if (isBlank(reference.getPages())){
             if (reference == null || isBlank(reference.getPages())){
                 return null;
             }else if (reference.getPages().matches(pageNoRe + "\\s*[-"+UTF8.EN_DASH+"]\\s*"+ pageNoRe)){
                 return "pp. " + reference.getPages();
-...
             }else if (type == ReferenceType.Generic){
                 return "generic reference";
             }else if (type == ReferenceType.Section){
                 return "in reference";
                 return "in-reference";
             } else {
                 return type.getLabel();
                 return "in-reference for " + type.getLabel();
+            }
+        }

                 return getTitleWithoutYearAndAuthorWebPage(ref, isAbbrev);
             }else if (type == ReferenceType.Thesis) {
                 return getTitleWithoutYearAndAuthorThesis(ref, isAbbrev);
             }else if (type == ReferenceType.Section || type == ReferenceType.BookSection){
             }else if(type == ReferenceType.BookSection){
                 return getTitleWithoutYearAndAuthorBookSection(ref, isAbbrev);
             }else if (type == ReferenceType.Section || type == ReferenceType.BookSection ){
                 // not needed in Section
                 logger.warn("Questionable procedure call. Procedure not implemented because not needed. ");
                 return null;
-...
                 title =  title.substring(1, len-1); //  SUBSTRING(@TitelAbbrev,1,@LEN-1)
+            }
             boolean needsComma = false;
             //titelAbbrev
             if (!"".equals(title) ){
-...
             nomRefCache += volumePart;
             //delete .
             while (nomRefCache.endsWith(".")){
                 nomRefCache = nomRefCache.substring(0, nomRefCache.length()-1);
+            }
             nomRefCache = CdmUtils.removeTrailingDots(nomRefCache);
             return nomRefCache.trim();
+        }
         private static String getTitleWithoutYearAndAuthorBookSection(Reference ref, boolean isAbbrev){
             if (ref == null){
                 return null;
+            }
             String title = CdmUtils.getPreferredNonEmptyString(ref.getTitle(), ref.getAbbrevTitle(), isAbbrev, true);
             title = CdmUtils.removeTrailingDots(title);
             return title.trim();
+        }
         public static  String getTitleWithoutYearAndAuthorGeneric(Reference genericReference, boolean isAbbrev){
             if (genericReference == null){
                 return null;

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 61157129

Added by Andreas Müller almost 3 years ago

Project

General

Profile

EDIT

Revision 61157129

Added by Andreas Müller almost 3 years ago

Related issues