Changeset 4901
- Timestamp:
- Apr 23, 2009, 3:57:52 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/clients/web/net/sf/basedb/clients/web/plugins/ParentBioMaterialLoader.java
r4900 r4901 51 51 { 52 52 Metadata metadata = Metadata.getInstance(item.getType().getDataClass()); 53 parents = metadata.getPropertyValue(dc, item, exportedProperty.name); 53 try 54 { 55 parents = metadata.getPropertyValue(dc, item, exportedProperty.name); 56 } 57 catch(Throwable e) 58 { 59 return null; 60 } 54 61 } 55 62 return parents; -
trunk/src/clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java
r4898 r4901 252 252 Annotatable.class.isAssignableFrom(itemType.getItemClass()); 253 253 MultiFormatter defaultFormatter = new MultiFormatter(new ToStringFormatter<Object>(), true); 254 defaultFormatter.registerFormatter(Date.class, FormatterFactory.getDateFormatter(sc)); 255 DataLoader dataloader = null; 254 defaultFormatter.registerFormatter(Date.class, FormatterFactory.getDateFormatter(sc)); 256 255 for (String column : columns) 257 256 { 258 257 Formatter<?> formatter = defaultFormatter; 258 DataLoader dataloader = null; 259 259 int splitAt = column.indexOf(":"); 260 260 if (splitAt >= 0) -
trunk/src/core/net/sf/basedb/util/formatter/NameableFormatter.java
r4900 r4901 37 37 public String format(Nameable nameableItem) 38 38 { 39 return nameableItem .getName();39 return nameableItem == null ? "" : nameableItem.getName(); 40 40 } 41 41 -
trunk/www/biomaterials/biosources/index.jsp
r4889 r4901 38 38 import="net.sf.basedb.core.PermissionDeniedException" 39 39 import="net.sf.basedb.core.ItemAlreadyExistsException" 40 import="net.sf.basedb.core.Sample" 41 import="net.sf.basedb.core.query.Hql" 42 import="net.sf.basedb.core.query.Orders" 43 import="net.sf.basedb.core.query.Restrictions" 44 import="net.sf.basedb.core.query.Expressions" 40 45 import="net.sf.basedb.util.RemovableUtil" 41 46 import="net.sf.basedb.util.ShareableUtil" 42 47 import="net.sf.basedb.util.OwnableUtil" 48 import="net.sf.basedb.util.formatter.NameableFormatter" 43 49 import="net.sf.basedb.clients.web.Base" 44 50 import="net.sf.basedb.clients.web.WebException" 45 51 import="net.sf.basedb.util.Values" 46 import="net.sf.basedb.clients.web.util.HTML" 52 import="net.sf.basedb.clients.web.plugins.ItemQueryLoader" 53 import="net.sf.basedb.clients.web.util.HTML" 47 54 import="java.util.Enumeration" 48 55 import="java.util.Set" … … 56 63 private static final ItemContext defaultContext = Base.createDefaultContext("name", "name,samples,description"); 57 64 private static final Item itemType = Item.BIOSOURCE; 65 66 private static void registerExportUtils(ItemContext cc) 67 { 68 // Register formatters 69 cc.setObject("export.formatter.&children(name)", new NameableFormatter()); 70 71 // Register dataloaders 72 String bioSourceParameter = "bioSource"; 73 final ItemQuery<Sample> sampleQuery = Sample.getQuery(); 74 sampleQuery.include(cc.getInclude()); 75 sampleQuery.restrict(Restrictions.eq(Hql.property("parent"), Expressions.parameter(bioSourceParameter))); 76 sampleQuery.order(Orders.asc(Hql.property("name"))); 77 cc.setObject("export.dataloader.&children(name)", new ItemQueryLoader(sampleQuery, bioSourceParameter)); 78 } 58 79 %> 59 80 <% … … 241 262 // Run an export plugin in a list context 242 263 ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext); 264 registerExportUtils(cc); 243 265 final ItemQuery<BioSource> query = BioSource.getQuery(); 244 266 cc.configureQuery(query, true); … … 250 272 // Run an export plugin in single-item context 251 273 ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext); 274 registerExportUtils(cc); 252 275 redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+biosource"; 253 276 } -
trunk/www/biomaterials/biosources/list_biosources.jsp
r4889 r4901 279 279 datatype="string" 280 280 filterable="true" 281 exportable="true" 281 282 /> 282 283 <tbl:columndef -
trunk/www/biomaterials/labeledextracts/index.jsp
r4889 r4901 38 38 import="net.sf.basedb.core.ItemResultIterator" 39 39 import="net.sf.basedb.core.Permission" 40 import="net.sf.basedb.core.Hybridization" 40 41 import="net.sf.basedb.core.ItemContext" 41 42 import="net.sf.basedb.core.MultiPermissions" … … 43 44 import="net.sf.basedb.core.PermissionDeniedException" 44 45 import="net.sf.basedb.core.ItemAlreadyExistsException" 46 import="net.sf.basedb.core.query.Hql" 47 import="net.sf.basedb.core.query.Orders" 48 import="net.sf.basedb.core.query.Restrictions" 49 import="net.sf.basedb.core.query.Expressions" 45 50 import="net.sf.basedb.util.RemovableUtil" 46 51 import="net.sf.basedb.util.ShareableUtil" … … 49 54 import="net.sf.basedb.clients.web.WebException" 50 55 import="net.sf.basedb.util.Values" 56 import="net.sf.basedb.clients.web.plugins.ItemQueryLoader" 57 import="net.sf.basedb.clients.web.plugins.ParentBioMaterialLoader" 51 58 import="net.sf.basedb.clients.web.util.HTML" 52 59 import="net.sf.basedb.util.formatter.Formatter" 60 import="net.sf.basedb.util.formatter.NameableFormatter" 53 61 import="net.sf.basedb.util.formatter.WellCoordinateFormatter" 54 62 import="net.sf.basedb.clients.web.formatter.FormatterFactory" … … 66 74 private static final Item itemType = Item.LABELEDEXTRACT; 67 75 68 private static void registerExportFormatters(ItemContext cc) 69 { 76 private static void registerExportUtils(ItemContext cc) 77 { 78 // Register formatters 70 79 cc.setObject("export.formatter.bioWell.row", new WellCoordinateFormatter(true)); 71 80 cc.setObject("export.formatter.bioWell.column", new WellCoordinateFormatter(false)); 81 cc.setObject("export.formatter.&creationEvent.sourceBioMaterials(name)", new NameableFormatter()); 82 cc.setObject("export.formatter.&sourceEvents(event.hybridization.name)", new NameableFormatter()); 83 84 // Register dataloaders 85 String lblExtractParameter = "labeledExtract"; 86 ItemQuery<Hybridization> query = Hybridization.getQuery(); 87 query.join(Hql.innerJoin("creationEvent.sources", Item.LABELEDEXTRACT.getAlias())); 88 query.include(cc.getInclude()); 89 query.restrict(Restrictions.eq(Hql.index(Item.LABELEDEXTRACT.getAlias(), null), Expressions.parameter(lblExtractParameter))); 90 query.order(Orders.asc(Hql.property("name"))); 91 cc.setObject("export.dataloader.&sourceEvents(event.hybridization.name)", new ItemQueryLoader(query, lblExtractParameter)); 92 cc.setObject("export.dataloader.&creationEvent.sourceBioMaterials(name)", new ParentBioMaterialLoader()); 72 93 } 73 94 %> … … 342 363 final ItemQuery<LabeledExtract> query = LabeledExtract.getQuery(); 343 364 cc.configureQuery(query, true); 344 registerExport Formatters(cc);365 registerExportUtils(cc); 345 366 cc.setQuery(query); 346 367 redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+labeled+extracts"; … … 350 371 // Run an export plugin in single-item context 351 372 ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext); 352 registerExport Formatters(cc);373 registerExportUtils(cc); 353 374 redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+labeled+extract"; 354 375 } -
trunk/www/biomaterials/labeledextracts/list_labeledextracts.jsp
r4889 r4901 365 365 datatype="string" 366 366 filterable="true" 367 exportable="true" 367 368 /> 368 369 <tbl:columndef … … 372 373 datatype="string" 373 374 filterable="true" 375 exportable="true" 374 376 /> 375 377 <tbl:columndef -
trunk/www/biomaterials/samples/index.jsp
r4889 r4901 33 33 import="net.sf.basedb.core.BioMaterialEvent" 34 34 import="net.sf.basedb.core.BioWell" 35 import="net.sf.basedb.core.Extract" 35 36 import="net.sf.basedb.core.Protocol" 36 37 import="net.sf.basedb.core.ItemQuery" … … 42 43 import="net.sf.basedb.core.PermissionDeniedException" 43 44 import="net.sf.basedb.core.ItemAlreadyExistsException" 45 import="net.sf.basedb.core.query.Hql" 46 import="net.sf.basedb.core.query.Orders" 47 import="net.sf.basedb.core.query.Restrictions" 48 import="net.sf.basedb.core.query.Expressions" 44 49 import="net.sf.basedb.util.RemovableUtil" 45 50 import="net.sf.basedb.util.ShareableUtil" … … 48 53 import="net.sf.basedb.clients.web.WebException" 49 54 import="net.sf.basedb.util.Values" 55 import="net.sf.basedb.clients.web.plugins.ParentBioMaterialLoader" 56 import="net.sf.basedb.clients.web.plugins.ItemQueryLoader" 50 57 import="net.sf.basedb.clients.web.util.HTML" 51 58 import="net.sf.basedb.util.formatter.Formatter" 52 59 import="net.sf.basedb.util.formatter.WellCoordinateFormatter" 60 import="net.sf.basedb.util.formatter.NameableFormatter" 53 61 import="net.sf.basedb.clients.web.formatter.FormatterFactory" 54 62 import="java.util.Enumeration" … … 65 73 private static final Item itemType = Item.SAMPLE; 66 74 67 private static void registerExportFormatters(ItemContext cc) 68 { 75 private static void registerExportUtils(ItemContext cc) 76 { 77 // Register formatters 69 78 cc.setObject("export.formatter.bioWell.row", new WellCoordinateFormatter(true)); 70 79 cc.setObject("export.formatter.bioWell.column", new WellCoordinateFormatter(false)); 80 cc.setObject("export.formatter.&creationEvent.sourceBioMaterials(name)", new NameableFormatter()); 81 cc.setObject("export.formatter.&children(name)", new NameableFormatter()); 82 83 // Register dataloaders 84 String sampleParameter = "samples"; 85 ItemQuery<Extract> extractQuery = Extract.getQuery(); 86 extractQuery.include(cc.getInclude()); 87 extractQuery.restrict(Restrictions.eq(Hql.property("parent"), Expressions.parameter(sampleParameter))); 88 extractQuery.order(Orders.asc(Hql.property("name"))); 89 cc.setObject("export.dataloader.&children(name)", new ItemQueryLoader(extractQuery, sampleParameter)); 90 cc.setObject("export.dataloader.&creationEvent.sourceBioMaterials(name)", new ParentBioMaterialLoader()); 71 91 } 72 92 %> … … 328 348 final ItemQuery<Sample> query = Sample.getQuery(); 329 349 cc.configureQuery(query, true); 330 registerExport Formatters(cc);350 registerExportUtils(cc); 331 351 cc.setQuery(query); 332 352 redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+samples"; … … 336 356 // Run an export plugin in single-item context 337 357 ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext); 338 registerExport Formatters(cc);358 registerExportUtils(cc); 339 359 redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+sample"; 340 360 } -
trunk/www/biomaterials/samples/list_samples.jsp
r4889 r4901 366 366 datatype="string" 367 367 filterable="true" 368 exportable="true" 368 369 /> 369 370 <tbl:columndef … … 373 374 datatype="string" 374 375 filterable="true" 376 exportable="true" 375 377 /> 376 378 <tbl:columndef -
trunk/www/lims/arraydesigns/index.jsp
r4889 r4901 30 30 import="net.sf.basedb.core.Item" 31 31 import="net.sf.basedb.core.Include" 32 import="net.sf.basedb.core.ArrayBatch" 32 33 import="net.sf.basedb.core.ArrayDesign" 33 34 import="net.sf.basedb.core.Affymetrix" … … 48 49 import="net.sf.basedb.core.PermissionDeniedException" 49 50 import="net.sf.basedb.core.ItemAlreadyExistsException" 51 import="net.sf.basedb.core.query.Expressions" 52 import="net.sf.basedb.core.query.Hql" 53 import="net.sf.basedb.core.query.Orders" 54 import="net.sf.basedb.core.query.Restrictions" 50 55 import="net.sf.basedb.util.RemovableUtil" 51 56 import="net.sf.basedb.util.ShareableUtil" 52 57 import="net.sf.basedb.util.OwnableUtil" 58 import="net.sf.basedb.util.formatter.NameableFormatter" 53 59 import="net.sf.basedb.clients.web.Base" 54 60 import="net.sf.basedb.clients.web.WebException" 55 61 import="net.sf.basedb.util.Values" 62 import="net.sf.basedb.clients.web.plugins.ItemQueryLoader" 56 63 import="net.sf.basedb.clients.web.util.HTML" 57 64 import="java.util.Enumeration" … … 66 73 private static final ItemContext defaultContext = Base.createDefaultContext("name", "name,platform,numDbFeatures,numFileFeatures,description"); 67 74 private static final Item itemType = Item.ARRAYDESIGN; 75 76 private static void registerExportUtils(ItemContext cc) 77 { 78 // Register formatters 79 cc.setObject("export.formatter.&arrayBatches(name)", new NameableFormatter()); 80 81 // Register dataloaders 82 String designParameter = "arrayDesign"; 83 ItemQuery<ArrayBatch> batchQuery = ArrayBatch.getQuery(); 84 batchQuery.include(cc.getInclude()); 85 batchQuery.restrict(Restrictions.eq(Hql.property("arrayDesign"), Expressions.parameter(designParameter))); 86 batchQuery.order(Orders.asc(Hql.property("name"))); 87 cc.setObject("export.dataloader.&arrayBatches(name)", new ItemQueryLoader(batchQuery, designParameter)); 88 } 68 89 %> 69 90 <% … … 283 304 cc.configureQuery(query, true); 284 305 cc.setQuery(query); 306 registerExportUtils(cc); 285 307 redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+array+designs"; 286 308 } … … 289 311 // Run an export plugin in single-item context 290 312 ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext); 313 registerExportUtils(cc); 291 314 redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+array+design"; 292 315 } -
trunk/www/lims/arraydesigns/list_designs.jsp
r4889 r4901 396 396 datatype="string" 397 397 filterable="true" 398 exportable="true" 398 399 /> 399 400 <tbl:columndef -
trunk/www/lims/geometries/index.jsp
r4889 r4901 36 36 import="net.sf.basedb.core.MultiPermissions" 37 37 import="net.sf.basedb.core.PermissionDeniedException" 38 import="net.sf.basedb.core.PlateType" 38 39 import="net.sf.basedb.core.ItemAlreadyExistsException" 40 import="net.sf.basedb.core.query.Hql" 41 import="net.sf.basedb.core.query.Expressions" 42 import="net.sf.basedb.core.query.Orders" 43 import="net.sf.basedb.core.query.Restrictions" 44 import="net.sf.basedb.util.formatter.NameableFormatter" 39 45 import="net.sf.basedb.util.RemovableUtil" 46 import="net.sf.basedb.util.Values" 40 47 import="net.sf.basedb.clients.web.Base" 41 import="net.sf.basedb.clients.web.WebException" 42 import="net.sf.basedb. util.Values"48 import="net.sf.basedb.clients.web.WebException" 49 import="net.sf.basedb.clients.web.plugins.ItemQueryLoader" 43 50 import="net.sf.basedb.clients.web.util.HTML" 44 51 import="java.util.Enumeration" … … 53 60 private static final ItemContext defaultContext = Base.createDefaultContext("name", "name,rows,columns,plateTypes,description"); 54 61 private static final Item itemType = Item.PLATEGEOMETRY; 62 63 private static void registerExportUtils(ItemContext cc) 64 { 65 // Register formatters 66 cc.setObject("export.formatter.&plateTypes(name)", new NameableFormatter()); 67 68 // Register dataloaders 69 String geometryParameter = "geometry"; 70 ItemQuery<PlateType> plateTypeQuery = PlateType.getQuery(); 71 plateTypeQuery.include(cc.getInclude()); 72 plateTypeQuery.include(Include.MINE, Include.SHARED, Include.IN_PROJECT, Include.OTHERS); 73 plateTypeQuery.restrict(Restrictions.eq(Hql.property("plateGeometry"), Expressions.parameter(geometryParameter))); 74 plateTypeQuery.order(Orders.asc(Hql.property("name"))); 75 cc.setObject("export.dataloader.&plateTypes(name)", new ItemQueryLoader(plateTypeQuery, geometryParameter)); 76 } 55 77 %> 56 78 <% … … 197 219 cc.configureQuery(query, true); 198 220 cc.setQuery(query); 221 registerExportUtils(cc); 199 222 redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+array+designs"; 200 223 } … … 203 226 // Run an export plugin in single-item context 204 227 ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext); 228 registerExportUtils(cc); 205 229 redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+array+design"; 206 230 } -
trunk/www/lims/geometries/list_geometries.jsp
r4889 r4901 264 264 datatype="string" 265 265 filterable="true" 266 exportable="true" 266 267 /> 267 268 <tbl:columndef -
trunk/www/lims/platetypes/index.jsp
r4889 r4901 38 38 import="net.sf.basedb.core.OwnedItem" 39 39 import="net.sf.basedb.core.PermissionDeniedException" 40 import="net.sf.basedb.core.Plate" 40 41 import="net.sf.basedb.core.ItemAlreadyExistsException" 42 import="net.sf.basedb.core.query.Expressions" 43 import="net.sf.basedb.core.query.Hql" 44 import="net.sf.basedb.core.query.Orders" 45 import="net.sf.basedb.core.query.Restrictions" 41 46 import="net.sf.basedb.util.RemovableUtil" 42 47 import="net.sf.basedb.util.ShareableUtil" 43 import="net.sf.basedb.util.OwnableUtil" 48 import="net.sf.basedb.util.OwnableUtil" 49 import="net.sf.basedb.util.formatter.NameableFormatter" 50 import="net.sf.basedb.util.Values" 44 51 import="net.sf.basedb.clients.web.Base" 45 52 import="net.sf.basedb.clients.web.WebException" 46 import="net.sf.basedb. util.Values"53 import="net.sf.basedb.clients.web.plugins.ItemQueryLoader" 47 54 import="net.sf.basedb.clients.web.util.HTML" 48 55 import="java.util.Enumeration" … … 57 64 private static final ItemContext defaultContext = Base.createDefaultContext("name", "name,geometry,plates,description"); 58 65 private static final Item itemType = Item.PLATETYPE; 66 67 private static void registerExportUtils(ItemContext cc) 68 { 69 // Register formatters 70 cc.setObject("export.formatter.&plates(name)", new NameableFormatter()); 71 72 // Register dataloaders 73 String plateTypeParameter = "plateType"; 74 ItemQuery<Plate> plateQuery = Plate.getQuery(); 75 plateQuery.include(cc.getInclude()); 76 plateQuery.restrict(Restrictions.eq(Hql.property("plateType"), Expressions.parameter(plateTypeParameter))); 77 plateQuery.order(Orders.asc(Hql.property("name"))); 78 cc.setObject("export.dataloader.&plates(name)", new ItemQueryLoader(plateQuery, plateTypeParameter)); 79 } 59 80 %> 60 81 <% … … 246 267 cc.configureQuery(query, true); 247 268 cc.setQuery(query); 269 registerExportUtils(cc); 248 270 redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+array+designs"; 249 271 } … … 252 274 // Run an export plugin in single-item context 253 275 ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext); 276 registerExportUtils(cc); 254 277 redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+array+design"; 255 278 } -
trunk/www/lims/platetypes/list_platetypes.jsp
r4889 r4901 282 282 datatype="string" 283 283 filterable="true" 284 exportable="true" 284 285 /> 285 286 <tbl:columndef -
trunk/www/views/hybridizations/index.jsp
r4889 r4901 43 43 import="net.sf.basedb.core.PermissionDeniedException" 44 44 import="net.sf.basedb.core.ItemAlreadyExistsException" 45 import="net.sf.basedb.core.Scan" 46 import="net.sf.basedb.core.query.Hql" 47 import="net.sf.basedb.core.query.Orders" 48 import="net.sf.basedb.core.query.Restrictions" 49 import="net.sf.basedb.core.query.Expressions" 45 50 import="net.sf.basedb.util.RemovableUtil" 46 51 import="net.sf.basedb.util.ShareableUtil" … … 51 56 import="net.sf.basedb.clients.web.util.HTML" 52 57 import="net.sf.basedb.util.formatter.Formatter" 58 import="net.sf.basedb.util.formatter.NameableFormatter" 53 59 import="net.sf.basedb.clients.web.formatter.FormatterFactory" 60 import="net.sf.basedb.clients.web.plugins.ItemQueryLoader" 54 61 import="java.util.Enumeration" 55 62 import="java.util.Set" … … 64 71 private static final ItemContext defaultContext = Base.createDefaultContext("name", "name,labeledExtracts,arraySlide,scans,description"); 65 72 private static final Item itemType = Item.HYBRIDIZATION; 73 74 private static void registerExportUtils(ItemContext cc) 75 { 76 // Register formatters 77 cc.setObject("export.formatter.&creationEvent.sourceBioMaterials(name)", new NameableFormatter()); 78 cc.setObject("export.formatter.&scans(name)", new NameableFormatter()); 79 80 // Register dataloaders 81 String hybridizationParameter = "hybridization"; 82 ItemQuery<LabeledExtract> labeledExtractQuery = LabeledExtract.getQuery(); 83 labeledExtractQuery.include(cc.getInclude()); 84 labeledExtractQuery.join(Hql.innerJoin("sourceEvents", "srcevt")); 85 labeledExtractQuery.join(Hql.innerJoin("srcevt", "event", "evt")); 86 labeledExtractQuery.restrict(Restrictions.eq(Hql.property("evt", "hybridization"), Expressions.parameter(hybridizationParameter))); 87 labeledExtractQuery.order(Orders.asc(Hql.property("name"))); 88 cc.setObject("export.dataloader.&creationEvent.sourceBioMaterials(name)", new ItemQueryLoader(labeledExtractQuery, hybridizationParameter)); 89 90 ItemQuery<Scan> scanQuery = Scan.getQuery(); 91 scanQuery.include(cc.getInclude()); 92 scanQuery.restrict(Restrictions.eq(Hql.property("hybridization"), Expressions.parameter(hybridizationParameter))); 93 scanQuery.order(Orders.asc(Hql.property("name"))); 94 cc.setObject("export.dataloader.&scans(name)", new ItemQueryLoader(scanQuery, hybridizationParameter)); 95 } 66 96 %> 67 97 <% … … 302 332 ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext); 303 333 final ItemQuery<Hybridization> query = Hybridization.getQuery(); 334 registerExportUtils(cc); 304 335 cc.configureQuery(query, true); 305 336 cc.setQuery(query); … … 310 341 // Run an export plugin in single-item context 311 342 ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext); 343 registerExportUtils(cc); 312 344 redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+hybridization"; 313 345 } -
trunk/www/views/hybridizations/list_hybridizations.jsp
r4889 r4901 279 279 datatype="string" 280 280 filterable="true" 281 exportable="true" 281 282 /> 282 283 <tbl:columndef … … 295 296 datatype="string" 296 297 filterable="true" 298 exportable="true" 297 299 /> 298 300 <tbl:columndef -
trunk/www/views/rawbioassays/index.jsp
r4889 r4901 38 38 import="net.sf.basedb.core.Software" 39 39 import="net.sf.basedb.core.ArrayDesign" 40 import="net.sf.basedb.core.Experiment" 40 41 import="net.sf.basedb.core.File" 41 42 import="net.sf.basedb.core.FileType" … … 63 64 import="net.sf.basedb.core.ItemParameterType" 64 65 import="net.sf.basedb.core.BooleanParameterType" 66 import="net.sf.basedb.core.query.Hql" 67 import="net.sf.basedb.core.query.Orders" 68 import="net.sf.basedb.core.query.Restrictions" 69 import="net.sf.basedb.core.query.Expressions" 65 70 import="net.sf.basedb.util.RemovableUtil" 66 71 import="net.sf.basedb.util.ShareableUtil" … … 69 74 import="net.sf.basedb.clients.web.WebException" 70 75 import="net.sf.basedb.util.Values" 71 import="net.sf.basedb.clients.web.util.HTML" 76 import="net.sf.basedb.util.formatter.NameableFormatter" 77 import="net.sf.basedb.clients.web.plugins.ItemQueryLoader" 78 import="net.sf.basedb.clients.web.util.HTML" 72 79 import="java.util.Enumeration" 73 80 import="java.util.Set" … … 82 89 private static final ItemContext defaultContext = Base.createDefaultContext("name", "name,platform,variant,hasData,description"); 83 90 private static final Item itemType = Item.RAWBIOASSAY; 91 92 private static void registerExportUtils(ItemContext cc) 93 { 94 // Register formatters 95 cc.setObject("export.formatter.&experiments(name)", new NameableFormatter()); 96 97 // Register dataloaders 98 String rawParameter = "rawBioAssay"; 99 final ItemQuery<Experiment> experimentQuery = Experiment.getQuery(); 100 experimentQuery.include(cc.getInclude()); 101 experimentQuery.join(Hql.innerJoin("rawBioAssays", "rba")); 102 experimentQuery.restrict(Restrictions.eq(Hql.alias("rba"), Expressions.parameter(rawParameter))); 103 experimentQuery.order(Orders.asc(Hql.property("name"))); 104 cc.setObject("export.dataloader.&experiments(name)", new ItemQueryLoader(experimentQuery, rawParameter)); 105 } 84 106 85 107 private static class UpdateArrayDesign … … 435 457 cc.configureQuery(query, true); 436 458 cc.setQuery(query); 459 registerExportUtils(cc); 437 460 redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=LIST&title=Export+raw+bioassays"; 438 461 } … … 441 464 // Run an export plugin in single-item context 442 465 ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext); 466 registerExportUtils(cc); 443 467 redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+raw+bioassay"; 444 468 } -
trunk/www/views/rawbioassays/list_rawbioassays.jsp
r4889 r4901 454 454 datatype="string" 455 455 filterable="true" 456 exportable="true" 456 457 /> 457 458 <tbl:columndef -
trunk/www/views/scans/index.jsp
r4889 r4901 41 41 import="net.sf.basedb.core.PermissionDeniedException" 42 42 import="net.sf.basedb.core.ItemAlreadyExistsException" 43 import="net.sf.basedb.core.RawBioAssay" 44 import="net.sf.basedb.core.query.Hql" 45 import="net.sf.basedb.core.query.Orders" 46 import="net.sf.basedb.core.query.Restrictions" 47 import="net.sf.basedb.core.query.Expressions" 43 48 import="net.sf.basedb.util.RemovableUtil" 44 49 import="net.sf.basedb.util.ShareableUtil" … … 46 51 import="net.sf.basedb.clients.web.Base" 47 52 import="net.sf.basedb.clients.web.WebException" 53 import="net.sf.basedb.util.formatter.NameableFormatter" 48 54 import="net.sf.basedb.util.Values" 55 import="net.sf.basedb.clients.web.plugins.ItemQueryLoader" 49 56 import="net.sf.basedb.clients.web.util.HTML" 50 57 import="java.util.Enumeration" … … 59 66 private static final ItemContext defaultContext = Base.createDefaultContext("name", "name,hybridization,rawBioAssays,description"); 60 67 private static final Item itemType = Item.SCAN; 68 69 private static void registerExportUtils(ItemContext cc) 70 { 71 // Register formatters 72 cc.setObject("export.formatter.&rawBioAssays(name)", new NameableFormatter()); 73 74 // Register dataloaders 75 String scanParameter = "scan"; 76 ItemQuery<RawBioAssay> rawQuery = RawBioAssay.getQuery(); 77 rawQuery.include(cc.getInclude()); 78 rawQuery.restrict(Restrictions.eq(Hql.property("scan"), Expressions.parameter(scanParameter))); 79 rawQuery.order(Orders.asc(Hql.property("name"))); 80 cc.setObject("export.dataloader.&rawBioAssays(name)", new ItemQueryLoader(rawQuery, scanParameter)); 81 } 61 82 %> 62 83 <% … … 266 287 ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext); 267 288 final ItemQuery<Scan> query = Scan.getQuery(); 289 registerExportUtils(cc); 268 290 cc.configureQuery(query, true); 269 291 cc.setQuery(query); … … 274 296 // Run an export plugin in single-item context 275 297 ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext); 298 registerExportUtils(cc); 276 299 redirect = "../../common/export/index.jsp?ID="+ID+"&cmd=SelectPlugin&item_type="+itemType.name()+"&context_type=ITEM&title=Export+scan"; 277 300 } -
trunk/www/views/scans/list_scans.jsp
r4889 r4901 296 296 datatype="string" 297 297 filterable="true" 298 exportable="true" 298 299 /> 299 300 <tbl:columndef
Note: See TracChangeset
for help on using the changeset viewer.