Revision 385d1194
Added by Patrick Plitzner almost 10 years ago
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/out/DbSingleSourceMapper.java | ||
|---|---|---|
| 60 | 60 |
this.exclude = exclude; |
| 61 | 61 |
} |
| 62 | 62 |
|
| 63 |
/* (non-Javadoc) |
|
| 64 |
* @see eu.etaxonomy.cdm.io.berlinModel.out.mapper.DbSingleAttributeExportMapperBase#getValue(eu.etaxonomy.cdm.model.common.CdmBase) |
|
| 65 |
*/ |
|
| 66 | 63 |
@Override |
| 67 | 64 |
protected Object getValue(CdmBase cdmBase) {
|
| 68 | 65 |
//TODO implement also for Identifiable sources |
| ... | ... | |
| 113 | 110 |
return result; |
| 114 | 111 |
} |
| 115 | 112 |
|
| 116 |
/* (non-Javadoc) |
|
| 117 |
* @see eu.etaxonomy.cdm.io.berlinModel.out.mapper.DbSingleAttributeExportMapperBase#getValueType() |
|
| 118 |
*/ |
|
| 119 | 113 |
@Override |
| 120 | 114 |
protected int getSqlType() {
|
| 121 | 115 |
if (isCache){
|
| ... | ... | |
| 125 | 119 |
} |
| 126 | 120 |
} |
| 127 | 121 |
|
| 128 |
|
|
| 129 |
/* (non-Javadoc) |
|
| 130 |
* @see eu.etaxonomy.cdm.io.common.CdmSingleAttributeMapperBase#getTypeClass() |
|
| 131 |
*/ |
|
| 132 | 122 |
@Override |
| 133 | 123 |
public Class<?> getTypeClass() {
|
| 134 | 124 |
if (isCache){
|
| cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java | ||
|---|---|---|
| 223 | 223 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber); |
| 224 | 224 |
pagerParams.normalizeAndValidate(response); |
| 225 | 225 |
|
| 226 |
if(features == null){
|
|
| 227 |
features = new DefinedTermBaseList<Feature>(); |
|
| 228 |
} |
|
| 229 |
|
|
| 226 | 230 |
Pager<DescriptionElementBase> pager = service.pageDescriptionElements(null, descriptionType, features.asSet(), |
| 227 | 231 |
type, pagerParams.getPageSize(), pagerParams.getPageIndex(), getInitializationStrategy()); |
| 228 | 232 |
|
| cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListPortalController.java | ||
|---|---|---|
| 175 | 175 |
PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber); |
| 176 | 176 |
pagerParams.normalizeAndValidate(response); |
| 177 | 177 |
|
| 178 |
if(features == null){
|
|
| 179 |
features = new DefinedTermBaseList<Feature>(); |
|
| 180 |
} |
|
| 181 |
|
|
| 178 | 182 |
Pager<DescriptionElementBase> pager = service.pageDescriptionElements(null, descriptionType, features.asSet(), |
| 179 | 183 |
type, pagerParams.getPageSize(), pagerParams.getPageIndex(), DESCRIPTION_ELEMENT_INIT_STRATEGY); |
| 180 | 184 |
|
| cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameBaseBeanProcessor.java | ||
|---|---|---|
| 18 | 18 |
|
| 19 | 19 |
import org.apache.log4j.Logger; |
| 20 | 20 |
|
| 21 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
|
| 21 | 22 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| 22 | 23 |
|
| 23 | 24 |
/** |
| ... | ... | |
| 28 | 29 |
|
| 29 | 30 |
public static final Logger logger = Logger.getLogger(TaxonNameBaseBeanProcessor.class); |
| 30 | 31 |
|
| 32 |
private boolean skipTaggedName = false; |
|
| 33 |
|
|
| 34 |
/** |
|
| 35 |
* @return the skipTaggedName |
|
| 36 |
*/ |
|
| 37 |
public boolean isSkipTaggedName() {
|
|
| 38 |
return skipTaggedName; |
|
| 39 |
} |
|
| 40 |
|
|
| 41 |
/** |
|
| 42 |
* @param skipTaggedName the skipTaggedName to set |
|
| 43 |
*/ |
|
| 44 |
public void setSkipTaggedName(boolean skipTaggedName) {
|
|
| 45 |
this.skipTaggedName = skipTaggedName; |
|
| 46 |
} |
|
| 47 |
|
|
| 31 | 48 |
/* (non-Javadoc) |
| 32 | 49 |
* @see eu.etaxonomy.cdm.remote.json.processor.AbstractCdmBeanProcessor#getIgnorePropNames() |
| 33 | 50 |
*/ |
| ... | ... | |
| 54 | 71 |
if(logger.isDebugEnabled()){
|
| 55 | 72 |
logger.debug("processing second step" + bean);
|
| 56 | 73 |
} |
| 57 |
json.element("taggedName", bean.getTaggedName(), jsonConfig);
|
|
| 74 |
if(!skipTaggedName){
|
|
| 75 |
json.element("taggedName", bean.getTaggedName(), jsonConfig);
|
|
| 76 |
} |
|
| 77 |
if(bean instanceof NonViralName){
|
|
| 78 |
json.element("nameCache", ((NonViralName) bean).getNameCache(), jsonConfig);
|
|
| 79 |
} |
|
| 58 | 80 |
return json; |
| 59 | 81 |
} |
| 60 | 82 |
|
| 61 |
|
|
| 62 |
|
|
| 63 | 83 |
} |
| cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml | ||
|---|---|---|
| 122 | 122 |
<entry key="eu.etaxonomy.cdm.model.reference.Reference"> |
| 123 | 123 |
<bean class="eu.etaxonomy.cdm.remote.json.processor.bean.ReferenceBaseBeanProcessor"/> |
| 124 | 124 |
</entry> |
| 125 |
<entry key="eu.etaxonomy.cdm.model.name.TaxonNameBase"> |
|
| 126 |
<bean |
|
| 127 |
class="eu.etaxonomy.cdm.remote.json.processor.bean.TaxonNameBaseBeanProcessor"> |
|
| 128 |
<property name="skipTaggedName" value="true" /> |
|
| 129 |
</bean> |
|
| 130 |
</entry> |
|
| 125 | 131 |
<entry key="eu.etaxonomy.cdm.model.name.TypeDesignationBase"> |
| 126 | 132 |
<bean class="eu.etaxonomy.cdm.remote.json.processor.bean.TypeDesignationBaseBeanProcessor"/> |
| 127 | 133 |
</entry> |
| ... | ... | |
| 492 | 498 |
</list> |
| 493 | 499 |
</property> |
| 494 | 500 |
</bean> |
| 495 |
|
|
| 501 |
|
|
| 496 | 502 |
<bean name="occurrenceCatalogueJsonConfig" class="eu.etaxonomy.cdm.remote.json.JsonConfigFactoryBean" |
| 497 | 503 |
init-method="init"> |
| 498 | 504 |
<property name="jsonPropertyFilter"> |
| ... | ... | |
| 548 | 554 |
</list> |
| 549 | 555 |
</property> |
| 550 | 556 |
</bean> |
| 551 |
|
|
| 557 |
|
|
| 552 | 558 |
|
| 553 | 559 |
</beans> |
Also available in: Unified diff
merge update from trunk