Revision: 1752
http://geeqie.svn.sourceforge.net/geeqie/?rev=1752&view=rev
Author: nadvornik
Date: 2009-06-19 22:37:30 +0000 (Fri, 19 Jun 2009)
Log Message:
-----------
fixed regexp usage
Modified Paths:
--------------
trunk/plugins/ufraw/geeqie-ufraw
Modified: trunk/plugins/ufraw/geeqie-ufraw
===================================================================
--- trunk/plugins/ufraw/geeqie-ufraw 2009-06-19 22:34:52 UTC (rev 1751)
+++ trunk/plugins/ufraw/geeqie-ufraw 2009-06-19 22:37:30 UTC (rev 1752)
@@ -9,7 +9,7 @@
# matches raw file names, used as case insensitive
-RAW_REGEX='.*\.\(arw\)\|\(srf\)\|\(sr2\)\|\(crw\)\|\(cr2\)\|\(kdc\)\|\(dcr\)\|\(k25\)\|\(raf\)\|\(mef\)\|\(mos\)\|\(mrw\)\|\(nef\)\|\(orf\)\|\(pef\)\|\(ptx\)\|\(dng\)\|\(x3f\)\|\(raw\)\|\(r3d\)\|\(3fr\)\|\(erf\)$'
+RAW_REGEX='.*\.(arw|srf|sr2|crw|cr2|kdc|dcr|k25|raf|mef|mos|mrw|nef|orf|pef|ptx|dng|x3f|raw|r3d|3fr|erf)$'
# matches ufraw id file names, used as case sensitive
ID_REGEX='.*\.ufraw$'
@@ -72,9 +72,9 @@
if [ "$count" -gt 0 ] ; then
while read file; do
[ -f "$file" ] || continue
- if echo "$file"|grep -q -i "$RAW_REGEX" ; then
+ if echo "$file"|grep -E -q -i "$RAW_REGEX" ; then
process_raw_file_default "$file"
- elif echo "$file"|grep -q "$ID_REGEX" ; then
+ elif echo "$file"|grep -E -q "$ID_REGEX" ; then
process_ufraw_id_file "$file"
fi
@@ -96,12 +96,12 @@
{
list=`mktemp /tmp/geeqie-ufraw-list.XXXXXXXXXX` || exit 1
- find "$1" -iregex "$RAW_REGEX" -print | while read rawfile ; do
+ find "$1" -regextype posix-egrep -iregex "$RAW_REGEX" -print | while read
rawfile ; do
raw_file_not_processed "$rawfile" && echo "$rawfile"
done >>$list
#refresh output from changed id files
- find "$1" -regex "$ID_REGEX" -print | while read idfile ; do
+ find "$1" -regextype posix-egrep -regex "$ID_REGEX" -print | while read
idfile ; do
id_file_changed "$idfile" && echo "$idfile"
done >>$list
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Are you an open source citizen? Join us for the Open Source Bridge conference!
Portland, OR, June 17-19. Two days of sessions, one day of unconference: $250.
Need another reason to go? 24-hour hacker lounge. Register today!
http://ad.doubleclick.net/clk;215844324;13503038;v?http://opensourcebridge.org
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
