[GME-commit] GMESRC/GME/Mga MgaFilter.cpp,1.9,1.10

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/Mga
In directory escher:/tmp/cvs-serv12751/GME/Mga

Modified Files:
	MgaFilter.cpp 
Log Message:
GME release 5.5.19
IMgaFilter can handle names with spaces in them (by using quotes)

CVS User: Peter Volgyesi, ISIS (volgy)

Index: MgaFilter.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Mga/MgaFilter.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MgaFilter.cpp	26 Jan 2005 17:30:47 -0000	1.9
--- MgaFilter.cpp	19 May 2005 19:43:41 -0000	1.10
***************
*** 80,86 ****
  			MGA_TRACE("Names: %ls\n",*i);
  		}
! 		for(OLECHAR *p = wcstok(name, L" "); p; p = wcstok(NULL,L" ")) {
! 			names.insert(CComBSTR(p));
! 		}	
  		MGA_TRACE("Names at init");
  		for(i = names.begin(); i!=names.end(); i++) {
--- 80,110 ----
  			MGA_TRACE("Names: %ls\n",*i);
  		}
! 
! 		wchar_t *finish = name + wcslen(name);
! 		bool inquotes = false;
! 		wchar_t *begin = name;
! 		wchar_t *end = wcschr(begin, L'\"');
! 		if (!end) {
! 			end = finish;
! 		}
! 		while (begin < finish) {
! 			*end = L'\0';
! 			if (inquotes) {
! 				names.insert(CComBSTR(begin));
! 				inquotes = false;
! 			}
! 			else {
! 				for(OLECHAR *p = wcstok(begin, L" "); p; p = wcstok(NULL,L" ")) {
! 					names.insert(CComBSTR(p));
! 				}	
! 				inquotes = true;
! 			}
! 			begin = end + 1;
! 			end = wcschr(begin, L'\"');
! 			if (!end) {
! 				end = finish;
! 			}
! 		}
! 
  		MGA_TRACE("Names at init");
  		for(i = names.begin(); i!=names.end(); i++) {