|
From: <li...@us...> - 2008-11-01 14:56:24
|
Revision: 566
http://pyphant.svn.sourceforge.net/pyphant/?rev=566&view=rev
Author: liehr
Date: 2008-11-01 14:56:20 +0000 (Sat, 01 Nov 2008)
Log Message:
-----------
Variable delimiter in FMF headline can be explicitely set to 'whitespace'.
Modified Paths:
--------------
trunk/doc/demo/example_delimiter.fmf
trunk/src/workers/fmfile/fmfile/FMFLoader2.py
Modified: trunk/doc/demo/example_delimiter.fmf
===================================================================
--- trunk/doc/demo/example_delimiter.fmf 2008-10-31 05:40:11 UTC (rev 565)
+++ trunk/doc/demo/example_delimiter.fmf 2008-11-01 14:56:20 UTC (rev 566)
@@ -1,4 +1,4 @@
-# -*- fmf-version: 1.0; coding: utf-8; delimiter: space -*-
+# -*- fmf-version: 1.0; coding: utf-8; delimiter: whitespace -*-
[*reference]
title: Demonstrating the flexibility of the Full-Metadata-Format
creator: Andreas W. Liehr
Modified: trunk/src/workers/fmfile/fmfile/FMFLoader2.py
===================================================================
--- trunk/src/workers/fmfile/fmfile/FMFLoader2.py 2008-10-31 05:40:11 UTC (rev 565)
+++ trunk/src/workers/fmfile/fmfile/FMFLoader2.py 2008-11-01 14:56:20 UTC (rev 566)
@@ -385,8 +385,8 @@
items = [var.strip().split(':') for var in b.split('-*-')[1].split(';')]
for key,value in items:
localVar[key.strip()]=value.strip()
- if localVar[key.strip()]=='space':
- localVar[key.strip()] = ' '
+ if localVar[key.strip()]=='whitespace':
+ localVar[key.strip()] = None
d = unicode(b, localVar['coding'])
dataExpr = re.compile(ur"^(\[\*data(?::\s*([^\]]*))?\]\r?\n)([^[]*)", re.MULTILINE | re.DOTALL)
commentExpr = re.compile(ur"^%s.*"%commentChar, re.MULTILINE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|