Author: jm
Date: 2011-06-14 11:44:55 -0700 (Tue, 14 Jun 2011)
New Revision: 25750
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/session/SessionReaderImpl.java
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/session/SessionWriterImpl.java
Log:
Added SUID to global table file name so we can perform mapping when it comes
time to deserialize virtual columns and equations
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/session/SessionReaderImpl.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/session/SessionReaderImpl.java
2011-06-14 18:23:03 UTC (rev 25749)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/session/SessionReaderImpl.java
2011-06-14 18:44:55 UTC (rev 25750)
@@ -108,7 +108,7 @@
public static final int MAJOR_DOC_VERSION = 3;
public static final Pattern NETWORK_PATTERN =
Pattern.compile(".*/([^/]+)[.]xgmml");
public static final Pattern NETWORK_TABLE_PATTERN =
Pattern.compile(".*/([^/]+)/([^/]+)-([^/]+)-([^/]+)[.]table");
- public static final Pattern GLOBAL_TABLE_PATTERN =
Pattern.compile(".*/([^/]+)[.]table");
+ public static final Pattern GLOBAL_TABLE_PATTERN =
Pattern.compile(".*/(\\d+)-([^/]+)[.]table");
private static final Logger logger =
LoggerFactory.getLogger(SessionReaderImpl.class);
@@ -404,7 +404,9 @@
matcher = GLOBAL_TABLE_PATTERN.matcher(entryName);
if (matcher.matches()) {
- String title = URLDecoder.decode(matcher.group(1),
"UTF-8");
+ // table SUID is in group(1); we may need it when
restoring
+ // equations/virtual columns
+ String title = URLDecoder.decode(matcher.group(2),
"UTF-8");
table.setTitle(title);
Set<CyNetwork> networks = Collections.emptySet();
CyTableMetadataBuilder builder = new
CyTableMetadataBuilder()
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/session/SessionWriterImpl.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/session/SessionWriterImpl.java
2011-06-14 18:23:03 UTC (rev 25749)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/session/SessionWriterImpl.java
2011-06-14 18:44:55 UTC (rev 25750)
@@ -381,7 +381,7 @@
String fileName;
Set<CyNetwork> networks = metadata.getCyNetworks();
if (networks.size() == 0) {
- fileName = String.format("global/%s.table",
tableTitle);
+ fileName = String.format("global/%d-%s.table",
table.getSUID(), tableTitle);
} else {
CyNetwork network =
findIntersection(includedNetworks, networks);
if (network == null) {
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
