AANS#28185 Ook hoofdletter .DWF mag natuurlijk.

Enkele Regexp aangepast zodat extensie ook echt achteraan moet staan.

svn path=/Website/trunk/; revision=19976
This commit is contained in:
Jos Groot Lipman
2013-11-27 15:18:08 +00:00
parent 6891507ad6
commit 43052f8389
5 changed files with 8 additions and 8 deletions

View File

@@ -142,7 +142,7 @@ function onOtherDrawing()
for (; !fc4.atEnd(); fc4.moveNext())
{
var vTekening0 = fc4.item().Name;
if (vTekening0.match(/.dwf$/ig))
if (vTekening0.match(/.dwf$/i))
{
%> <option <%=nn==0?" SELECTED='1'":""%>><%=Server.HTMLEncode(vTekening0)%></option>
<%

View File

@@ -71,8 +71,8 @@ function contour_list(pautfunction, params)
else
{
var fname = oRs("cad_tekening_filenaam").value;
fname = fname.replace(/.dwg/g,'');
fname = fname.replace(/.dwf/g,'');
fname = fname.replace(/.dwg$/i,'');
fname = fname.replace(/.dwf$/i,'');
var fullnameActual = S("fg_dwf_path") + fname + ".dwf";
var fullnameConcept = S("fg_dwf_path_concept") + fname + ".dwf";
var fso = new ActiveXObject("Scripting.FileSystemObject");

View File

@@ -112,7 +112,7 @@ if (!fso.FileExists(fullnameDWF))
for (; !fc4.atEnd(); fc4.moveNext())
{
vTekening0 = fc4.item().Name;
if (vTekening0.match(".dwf")||vTekening0.match(".w2d"))
if (vTekening0.match(/.dwf$/i)||vTekening0.match(/.w2d$/))
{
%> <option <%=vTekening0==dwf?"selected='1'":""%>><%=Server.HTMLEncode(vTekening0)%></option>
<%

View File

@@ -52,8 +52,8 @@ if (verdieping_key > 0 || (gebouw_key > 0 && bttype == "T"))
+ " AND ct.alg_verdieping_key IS NULL");
oRs = Oracle.Execute(sql);
var fname = oRs("cad_tekening_filenaam").value;
fname = fname.replace(/.dwg/g,'');
fname = fname.replace(/.dwf/g,'');
fname = fname.replace(/.dwg$/i,'');
fname = fname.replace(/.dwf$/i,'');
var fullnameConcept = S("fg_dwf_path_concept") + fname + ".dwf";
var fso = new ActiveXObject("Scripting.FileSystemObject");
concept = fso.FileExists(fullnameConcept);

View File

@@ -52,8 +52,8 @@ if (floor_key > 0 || (building_key > 1 && bttype == "T")) // alvast een en ander
oRs = Oracle.Execute(sql);
var cad_tek_key = oRs("cad_tekening_key").value;
var fname = oRs("cad_tekening_filenaam").value;
fname = fname.replace(/.dwg/g,'');
fname = fname.replace(/.dwf/g,'');
fname = fname.replace(/.dwg$/i,'');
fname = fname.replace(/.dwf$/i,'');
var fullnameActual = S("fg_dwf_path") + fname + ".dwf";
var fullnameConcept = S("fg_dwf_path_concept") + fname + ".dwf";
var fso = new ActiveXObject("Scripting.FileSystemObject");