placeholder work. Refactored out several calls to session->form into a single call

This commit is contained in:
Colin Kuskie 2007-06-01 18:32:32 +00:00
parent c3ce237e9d
commit a426a50eb0

View file

@ -48,12 +48,12 @@ The fieldId to be deleted.
=cut =cut
sub deleteMetaDataField { sub deleteMetaDataField {
my $self = shift; my $self = shift;
my $fieldId = shift; my $fieldId = shift;
$self->session->db->beginTransaction; $self->session->db->beginTransaction;
$self->session->db->write("delete from metaData_properties where fieldId = ".$self->session->db->quote($fieldId)); $self->session->db->write("delete from metaData_properties where fieldId = ?",[$fieldId]);
$self->session->db->write("delete from metaData_values where fieldId = ".$self->session->db->quote($fieldId)); $self->session->db->write("delete from metaData_values where fieldId = ?",[$fieldId]);
$self->session->db->commit; $self->session->db->commit;
} }
@ -224,36 +224,46 @@ sub www_editMetaDataFieldSave {
my $i18n = WebGUI::International->new($self->session,"Asset"); my $i18n = WebGUI::International->new($self->session,"Asset");
$ac->setHelp("metadata edit property","Asset"); $ac->setHelp("metadata edit property","Asset");
# Check for duplicate field names # Check for duplicate field names
my $fid = $self->session->form->process("fid");
my $fieldName = $self->session->form->process("fieldName");
my $sql = "select count(*) from metaData_properties where fieldName = ". my $sql = "select count(*) from metaData_properties where fieldName = ".
$self->session->db->quote($self->session->form->process("fieldName")); $self->session->db->quote($fieldName);
if ($self->session->form->process("fid") ne "new") { if ($fid ne "new") {
$sql .= " and fieldId <> ".$self->session->db->quote($self->session->form->process("fid")); $sql .= " and fieldId <> ".$self->session->db->quote($fid);
} }
my ($isDuplicate) = $self->session->db->buildArray($sql); my ($isDuplicate) = $self->session->db->buildArray($sql);
if($isDuplicate) { if($isDuplicate) {
my $error = $i18n->get("duplicateField"); my $error = $i18n->get("duplicateField");
$error =~ s/\%field\%/$self->session->form->process("fieldName")/; $error =~ s/\%field\%/$fieldName/;
return $ac->render($error,$i18n->get('Edit Metadata')); return $ac->render($error,$i18n->get('Edit Metadata'));
} }
if($self->session->form->process("fieldName") eq "") { if($fieldName eq "") {
return $ac->render($i18n->get("errorEmptyField"),$i18n->get('Edit Metadata')); return $ac->render($i18n->get("errorEmptyField"),$i18n->get('Edit Metadata'));
} }
if($self->session->form->process("fid") eq 'new') { if($fid eq 'new') {
my $fid = $self->session->id->generate(); $fid = $self->session->id->generate();
$self->session->db->write("insert into metaData_properties (fieldId, fieldName, defaultValue, description, fieldType, possibleValues) values (". $self->session->db->write("insert into metaData_properties (fieldId, fieldName, defaultValue, description, fieldType, possibleValues) values (?,?,?,?,?,?)",
$self->session->db->quote($fid).",". [
$self->session->db->quote($self->session->form->process("fieldName")).",". $fid,
$self->session->db->quote($self->session->form->process("defaultValue")).",". $fieldName,
$self->session->db->quote($self->session->form->process("description")).",". $self->session->form->process("defaultValue") || '',
$self->session->db->quote($self->session->form->process("fieldType")).",". $self->session->form->process("description") || '',
$self->session->db->quote($self->session->form->process("possibleValues")).")"); $self->session->form->process("fieldType"),
} else { $self->session->form->process("possibleValues") || '',
$self->session->db->write("update metaData_properties set fieldName = ".$self->session->db->quote($self->session->form->process("fieldName")).", ". ]
"defaultValue = ".$self->session->db->quote($self->session->form->process("defaultValue")).", ". );
"description = ".$self->session->db->quote($self->session->form->process("description")).", ". }
"fieldType = ".$self->session->db->quote($self->session->form->process("fieldType")).", ". else {
"possibleValues = ".$self->session->db->quote($self->session->form->process("possibleValues")). $self->session->db->write("update metaData_properties set fieldName = ?, defaultValue = ?, description = ?, fieldType = ?, possibleValues = ? where fieldId = ?",
" where fieldId = ".$self->session->db->quote($self->session->form->process("fid"))); [
$fieldName,
$self->session->form->process("defaultValue") || '',
$self->session->form->process("description") || '',
$self->session->form->process("fieldType"),
$self->session->form->process("possibleValues") || '',
$fid,
]
);
} }
return $self->www_manageMetaData; return $self->www_manageMetaData;