LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improvment for null numbers in the native SQL publication list. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@5159 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2017-12-07 14:23:19 +00:00
parent 52a5609621
commit 6d81102967
2 changed files with 126 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ccm-sci-member-navigation/src/com/arsdigita/cms/scimember/navigation/SciMemberList.java
View File

@ -44,6 +44,8 @@ public class SciMemberList extends AbstractComponent {
private final PreparedStatement contactQueryStatement; private final PreparedStatement contactQueryStatement;
private String categoryId;
private int limit = 20; private int limit = 20;
public SciMemberList() { public SciMemberList() {
@ -67,6 +69,14 @@ public class SciMemberList extends AbstractComponent {
} }
public String getCategoryId() {
return categoryId;
}
public void setCategoryId(final String categoryId) {
this.categoryId = categoryId;
}
public int getLimit() { public int getLimit() {
return limit; return limit;
} }
@ -83,7 +93,12 @@ public class SciMemberList extends AbstractComponent {
.getSession() .getSession()
.getConnection(); .getConnection();
final String categoryId = getCategory().getID().toString(); final String catId;
if (categoryId == null || categoryId.isEmpty()) {
catId = getCategory().getID().toString();
} else {
catId = categoryId;
}
final Element listElem = Navigation.newElement( final Element listElem = Navigation.newElement(
"sci-member-list"); "sci-member-list");
@ -118,7 +133,7 @@ public class SciMemberList extends AbstractComponent {
.prepareStatement(String.format(MEMBERS_QUERY_TEMPLATE, .prepareStatement(String.format(MEMBERS_QUERY_TEMPLATE,
whereBuffer.toString(), whereBuffer.toString(),
orderBy)); orderBy));
membersQueryStatement.setString(1, categoryId); membersQueryStatement.setString(1, catId);
membersQueryStatement.setInt(2, limit); membersQueryStatement.setInt(2, limit);
if (request.getParameter("page") == null) { if (request.getParameter("page") == null) {
@ -145,7 +160,7 @@ public class SciMemberList extends AbstractComponent {
.prepareStatement(String.format(COUNT_MEMBERS_QUERY_TEMPLATE, .prepareStatement(String.format(COUNT_MEMBERS_QUERY_TEMPLATE,
whereBuffer.toString())); whereBuffer.toString()));
countMembersQueryStatement.setString(1, categoryId); countMembersQueryStatement.setString(1, catId);
final ResultSet countResultSet = countMembersQueryStatement final ResultSet countResultSet = countMembersQueryStatement
.executeQuery(); .executeQuery();
final int count; final int count;

177
ccm-sci-publications-navigation/src/com/arsdigita/cms/scipublications/navigation/PublicationList.java
View File

@ -560,8 +560,10 @@ public class PublicationList extends AbstractComponent {
descriptionElem.setText(description); descriptionElem.setText(description);
} }
final Element yearElem = publicationElem.newChildElement("year"); if (resultSet.getInt("year") != 0) {
yearElem.setText(Integer.toString(resultSet.getInt("year"))); final Element yearElem = publicationElem.newChildElement("year");
yearElem.setText(Integer.toString(resultSet.getInt("year")));
}
final Element abstractElem = publicationElem.newChildElement("abstract"); final Element abstractElem = publicationElem.newChildElement("abstract");
abstractElem.setText(resultSet.getString("abstract")); abstractElem.setText(resultSet.getString("abstract"));
@ -576,10 +578,12 @@ public class PublicationList extends AbstractComponent {
"authorsStr"); "authorsStr");
authorsStrElem.setText(resultSet.getString("authors")); authorsStrElem.setText(resultSet.getString("authors"));
final Element firstPublishedElem = publicationElem.newChildElement( if (resultSet.getInt("firstPublished") != 0) {
"firstPublished"); final Element firstPublishedElem = publicationElem.newChildElement(
firstPublishedElem.setText(Integer.toString(resultSet.getInt( "firstPublished");
"firstPublished"))); firstPublishedElem.setText(Integer.toString(resultSet.getInt(
"firstPublished")));
}
final Element langElem = publicationElem.newChildElement("lang"); final Element langElem = publicationElem.newChildElement("lang");
langElem.setText(resultSet.getString("lang")); langElem.setText(resultSet.getString("lang"));
@ -587,18 +591,24 @@ public class PublicationList extends AbstractComponent {
final Element isbnElem = publicationElem.newChildElement("isbn"); final Element isbnElem = publicationElem.newChildElement("isbn");
isbnElem.setText(resultSet.getString("isbn")); isbnElem.setText(resultSet.getString("isbn"));
final Element volumeElem = publicationElem.newChildElement("volume"); if (resultSet.getInt("volume") != 0) {
volumeElem.setText(Integer.toString(resultSet.getInt("volume"))); final Element volumeElem = publicationElem.newChildElement("volume");
volumeElem.setText(Integer.toString(resultSet.getInt("volume")));
}
final Element numberOfVolumesElem = publicationElem.newChildElement( if (resultSet.getInt("number_of_volumes") != 0) {
"volume-of-volumes"); final Element numberOfVolumesElem = publicationElem.newChildElement(
numberOfVolumesElem.setText(Integer.toString(resultSet.getInt( "volume-of-volumes");
"number_of_volumes"))); numberOfVolumesElem.setText(Integer.toString(resultSet.getInt(
"number_of_volumes")));
}
final Element numberOfPagesElem = publicationElem.newChildElement( if (resultSet.getInt("_number_of_pages") != 0) {
"number-of-pages"); final Element numberOfPagesElem = publicationElem.newChildElement(
numberOfPagesElem.setText(Integer.toString(resultSet.getInt( "number-of-pages");
"_number_of_pages"))); numberOfPagesElem.setText(Integer.toString(resultSet.getInt(
"_number_of_pages")));
}
final Element editionElem = publicationElem.newChildElement("edition"); final Element editionElem = publicationElem.newChildElement("edition");
editionElem.setText(resultSet.getString("edition")); editionElem.setText(resultSet.getString("edition"));
@ -657,15 +667,19 @@ public class PublicationList extends AbstractComponent {
if (ArticleInCollectedVolume.BASE_DATA_OBJECT_TYPE.equals(resultSet if (ArticleInCollectedVolume.BASE_DATA_OBJECT_TYPE.equals(resultSet
.getString("object_type"))) { .getString("object_type"))) {
final Element pagesFromElem = publicationElem.newChildElement( if (resultSet.getInt("collvol_pages_from") != 0) {
"pages-from"); final Element pagesFromElem = publicationElem.newChildElement(
pagesFromElem.setText(Integer.toString(resultSet.getInt( "pages-from");
"collvol_pages_from"))); pagesFromElem.setText(Integer.toString(resultSet.getInt(
"collvol_pages_from")));
}
final Element pagesToElem = publicationElem.newChildElement( if (resultSet.getInt("collvol_pages_to") != 0) {
"pages-to"); final Element pagesToElem = publicationElem.newChildElement(
pagesToElem.setText(Integer.toString(resultSet.getInt( "pages-to");
"collvol_pages_to"))); pagesToElem.setText(Integer.toString(resultSet.getInt(
"collvol_pages_to")));
}
final Element chapterElem = publicationElem.newChildElement( final Element chapterElem = publicationElem.newChildElement(
"chapter"); "chapter");
@ -675,23 +689,30 @@ public class PublicationList extends AbstractComponent {
if (ArticleInJournal.BASE_DATA_OBJECT_TYPE.equals(resultSet.getString( if (ArticleInJournal.BASE_DATA_OBJECT_TYPE.equals(resultSet.getString(
"object_type"))) { "object_type"))) {
final Element pagesFromElem = publicationElem.newChildElement( if (resultSet.getInt("journal_pages_from") != 0) {
"pages-from"); final Element pagesFromElem = publicationElem.newChildElement(
pagesFromElem.setText(Integer.toString(resultSet.getInt( "pages-from");
"journal_pages_from"))); pagesFromElem.setText(Integer.toString(resultSet.getInt(
"journal_pages_from")));
}
final Element pagesToElem = publicationElem.newChildElement( if (resultSet.getInt("journal_pages_to") != 0) {
"pages-to"); final Element pagesToElem = publicationElem.newChildElement(
pagesToElem.setText(Integer.toString(resultSet.getInt( "pages-to");
"journal_pages_to"))); pagesToElem.setText(Integer.toString(resultSet.getInt(
"journal_pages_to")));
}
final Element issueElem = publicationElem.newChildElement("issue"); final Element issueElem = publicationElem.newChildElement("issue");
issueElem.setText(resultSet.getString("issue")); issueElem.setText(resultSet.getString("issue"));
final Element journalVolumeElem = publicationElem.newChildElement( if (resultSet.getInt("journal_volume") != 0) {
"volume-of-journal"); final Element journalVolumeElem = publicationElem
journalVolumeElem.setText(Integer.toString(resultSet.getInt( .newChildElement(
"journal_volume"))); "volume-of-journal");
journalVolumeElem.setText(Integer.toString(resultSet.getInt(
"journal_volume")));
}
if (resultSet.getDate("publication_date") != null) { if (resultSet.getDate("publication_date") != null) {
final Element publicationDateElem = publicationElem final Element publicationDateElem = publicationElem
@ -719,24 +740,30 @@ public class PublicationList extends AbstractComponent {
"expertise-place"); "expertise-place");
expertisePlaceElem.setText(resultSet.getString("expertise_place")); expertisePlaceElem.setText(resultSet.getString("expertise_place"));
final Element expertiseNumberOfPagesElem = publicationElem if (resultSet.getInt("expertise_number_of_pages") != 0) {
.newChildElement("expertise-number-of-pages"); final Element expertiseNumberOfPagesElem = publicationElem
expertiseNumberOfPagesElem.setText(Integer.toString(resultSet .newChildElement("expertise-number-of-pages");
.getInt("expertise_number_of_pages"))); expertiseNumberOfPagesElem.setText(Integer.toString(resultSet
.getInt("expertise_number_of_pages")));
}
} }
if (InProceedings.BASE_DATA_OBJECT_TYPE.equals(resultSet.getString( if (InProceedings.BASE_DATA_OBJECT_TYPE.equals(resultSet.getString(
"object_type"))) { "object_type"))) {
final Element pagesFromElem = publicationElem.newChildElement( if (resultSet.getInt("inproceedings_pages_from") != 0) {
"inproceedings-pages-from"); final Element pagesFromElem = publicationElem.newChildElement(
pagesFromElem.setText(Integer.toString(resultSet.getInt( "inproceedings-pages-from");
"inproceedings_pages_from"))); pagesFromElem.setText(Integer.toString(resultSet.getInt(
"inproceedings_pages_from")));
}
final Element pagesToElem = publicationElem.newChildElement( if (resultSet.getInt("inproceedings_pages_to") != 0) {
"inproceedings-pages-to"); final Element pagesToElem = publicationElem.newChildElement(
pagesToElem.setText(Integer.toString(resultSet.getInt( "inproceedings-pages-to");
"inproceedings_pages_to"))); pagesToElem.setText(Integer.toString(resultSet.getInt(
"inproceedings_pages_to")));
}
} }
if (InternetArticle.BASE_DATA_OBJECT_TYPE.equals(resultSet.getString( if (InternetArticle.BASE_DATA_OBJECT_TYPE.equals(resultSet.getString(
@ -750,12 +777,15 @@ public class PublicationList extends AbstractComponent {
"internet-article-number"); "internet-article-number");
numberElem.setText(resultSet.getString("internet_article_number")); numberElem.setText(resultSet.getString("internet_article_number"));
final Element internetArticleNumberOfPagesElem = publicationElem if (resultSet.getInt("internet_article_number_of_pages") != 0) {
.newChildElement( final Element internetArticleNumberOfPagesElem = publicationElem
"internet-article-number-of-pages"); .newChildElement(
internetArticleNumberOfPagesElem.setText(Integer.toString(resultSet "internet-article-number-of-pages");
.getInt( internetArticleNumberOfPagesElem.setText(Integer.toString(
"internet_article_number_of_pages"))); resultSet
.getInt(
"internet_article_number_of_pages")));
}
final Element internetArticleEditionElem = publicationElem final Element internetArticleEditionElem = publicationElem
.newChildElement( .newChildElement(
@ -834,23 +864,30 @@ public class PublicationList extends AbstractComponent {
unpublishedNumberElem.setText(resultSet.getString( unpublishedNumberElem.setText(resultSet.getString(
"unpublished_number")); "unpublished_number"));
final Element unpublishedNumberOfPagesElem = publicationElem if (resultSet.getInt("unpublished_number_of_pages") != 0) {
.newChildElement("unpublished-number-of-pages"); final Element unpublishedNumberOfPagesElem = publicationElem
unpublishedNumberOfPagesElem.setText(Integer.toString(resultSet .newChildElement("unpublished-number-of-pages");
.getInt("unpublished_number_of_pages"))); unpublishedNumberOfPagesElem.setText(Integer.toString(resultSet
.getInt("unpublished_number_of_pages")));
}
if (GreyLiterature.BASE_DATA_OBJECT_TYPE.equals(resultSet.getString( if (GreyLiterature.BASE_DATA_OBJECT_TYPE.equals(resultSet.getString(
"object_type"))) { "object_type"))) {
final Element greyLiteraturePagesFromElem = publicationElem if (resultSet.getInt("grey_literature_pages_from") != 0) {
.newChildElement("grey-literature-pages-from"); final Element greyLiteraturePagesFromElem = publicationElem
greyLiteraturePagesFromElem.setText(Integer.toString(resultSet .newChildElement("grey-literature-pages-from");
.getInt("grey_literature_pages_from"))); greyLiteraturePagesFromElem.setText(Integer.toString(
resultSet
.getInt("grey_literature_pages_from")));
}
final Element greyLiteraturePagesToElem = publicationElem if (resultSet.getInt("grey_literature_pages_to") != 0) {
.newChildElement("grey-literature-pages-to"); final Element greyLiteraturePagesToElem = publicationElem
greyLiteraturePagesToElem.setText(Integer.toString(resultSet .newChildElement("grey-literature-pages-to");
.getInt("grey_literature_pages_to"))); greyLiteraturePagesToElem.setText(Integer.toString(resultSet
.getInt("grey_literature_pages_to")));
}
} }
@ -1034,9 +1071,11 @@ public class PublicationList extends AbstractComponent {
final Element titleElem = proceedingsElem final Element titleElem = proceedingsElem
.newChildElement("title"); .newChildElement("title");
titleElem.setText(resultSet.getString("title")); titleElem.setText(resultSet.getString("title"));
final Element yearElem = proceedingsElem if (resultSet.getInt("year") != 0) {
.newChildElement("year"); final Element yearElem = proceedingsElem
yearElem.setText(Integer.toString(resultSet.getInt("year"))); .newChildElement("year");
yearElem.setText(Integer.toString(resultSet.getInt("year")));
}
// final Element editionElem = proceedingsElem // final Element editionElem = proceedingsElem
// .newChildElement("edition"); // .newChildElement("edition");
// editionElem.setText(resultSet.getString("edition")); // editionElem.setText(resultSet.getString("edition"));