ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/proj/trunk/VTBFileUtil2/ScanUtility.cxx

Comparing trunk/VTBFileUtil2/ScanUtility.cxx (file contents):
Revision 284 by douglas, 2003-09-01T23:05:56-07:00 vs.
Revision 288 by douglas, 2003-09-03T15:58:38-07:00

#	Line 2 | Line 2
2		//
3		// Douglas Thrift
4		//
5	<	// $Id: ScanUtility.cxx,v 1.13 2003/09/02 06:05:56 douglas Exp $
5	>	// $Id: ScanUtility.cxx,v 1.14 2003/09/03 22:58:38 douglas Exp $
6
7		#include "ScanUtility.h"
8
#	Line 130 | Line 130 | void ScanUtility::loadDirs(void)
130
131		ExpandEnvironmentStrings(data, folder, MAX_PATH);
132
133	<	scanDir = folder;
133	>	scanDir = tail(folder);
134		}
135		break;
136		case REG_SZ:
137	<	scanDir = data;
137	>	scanDir = tail(data);
138		break;
139		default:
140		setScanDir();
#	Line 161 | Line 161 | void ScanUtility::loadDirs(void)
161
162		ExpandEnvironmentStrings(data, folder, MAX_PATH);
163
164	<	saveDir = folder;
164	>	saveDir = tail(folder);
165		}
166		break;
167		case REG_SZ:
168	<	saveDir = data;
168	>	saveDir = tail(data);
169		break;
170		default:
171		setSaveDir();
#	Line 273 | Line 273 | void ScanUtility::setScanDir(HWND parent
273		{
274		char folder[MAX_PATH];
275
276	<	if (SHGetPathFromIDList(id, folder))
277	<	{
278	<	scanDir = folder;
279	<	}
276	>	if (SHGetPathFromIDList(id, folder)) scanDir = tail(folder);
277		}
278
279		LPMALLOC destruct;
#	Line 330 | Line 327 | void ScanUtility::setSaveDir(HWND parent
327		{
328		char folder[MAX_PATH];
329
330	<	if (SHGetPathFromIDList(id, folder))
334	<	{
335	<	saveDir = folder;
336	<	}
330	>	if (SHGetPathFromIDList(id, folder)) saveDir = tail(folder);
331		}
332
333		LPMALLOC destruct;
#	Line 372 | Line 366 | void ScanUtility::populate(HWND parent)
366
367		do
368		{
369	<	string scan = scanDir + "\\SCAN????_000." +
369	>	string scan = scanDir + "SCAN????_000." +
370		IndividualClient::getExtension();
371		WIN32_FIND_DATA found;
372		HANDLE finder = FindFirstFile(scan.c_str(), &found);
#	Line 387 | Line 381 | void ScanUtility::populate(HWND parent)
381
382		FindClose(finder);
383		}
384	+	else
385	+	{
386	+	error(parent);
387	+	}
388
389		if (scans.empty())
390		{
#	Line 555 | Line 553 | INT_PTR ScanUtility::start(HWND dialog,
553		{
554		char folder[38];
555
556	<	PathCompactPathEx(folder, data->scanDir.c_str(), 38, 0);
556	>	PathCompactPathEx(folder, data->scanDir.substr(0,
557	>	data->scanDir.length() - 1).c_str(), 38, 0);
558		SetDlgItemText(dialog, IDC_START_SCAN_TEXT, folder);
559	<	PathCompactPathEx(folder, data->saveDir.c_str(), 38, 0);
559	>	PathCompactPathEx(folder, data->saveDir.substr(0,
560	>	data->saveDir.length() - 1).c_str(), 38, 0);
561		SetDlgItemText(dialog, IDC_START_SAVE_TEXT, folder);
562		}
563		break;
#	Line 589 | Line 589 | INT_PTR ScanUtility::start(HWND dialog,
589		{
590		char folder[38];
591
592	<	PathCompactPathEx(folder, data->scanDir.c_str(), 38, 0);
592	>	PathCompactPathEx(folder, data->scanDir.substr(0,
593	>	data->scanDir.length() - 1).c_str(), 38, 0);
594		SetDlgItemText(dialog, IDC_START_SCAN_TEXT, folder);
595		}
596		break;
#	Line 612 | Line 613 | INT_PTR ScanUtility::start(HWND dialog,
613		{
614		char folder[38];
615
616	<	PathCompactPathEx(folder, data->saveDir.c_str(), 38, 0);
616	>	PathCompactPathEx(folder, data->saveDir.substr(0,
617	>	data->saveDir.length() - 1).c_str(), 38, 0);
618		SetDlgItemText(dialog, IDC_START_SAVE_TEXT, folder);
619		}
620		break;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines