From 64653840cc451a4b9b1d3b3ddcf873f65476bdae Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: May 23 2011 23:24:15 +0000 Subject: Rename render_svg_checkExportId to render_svg_checkModelExportId. --- diff --git a/Scripts/Functions/Render/render_svg.sh b/Scripts/Functions/Render/render_svg.sh index 2a3d3f7..5ecee92 100644 --- a/Scripts/Functions/Render/render_svg.sh +++ b/Scripts/Functions/Render/render_svg.sh @@ -30,7 +30,7 @@ function render_svg { local EXPORTID='CENTOSARTWORK' # Verify the export id. - render_svg_checkExportId "$INSTANCE" "$EXPORTID" + render_svg_checkModelExportId "$INSTANCE" "$EXPORTID" # Check existence of external files. Inside design templates and # their instances, external files are used to refere the diff --git a/Scripts/Functions/Render/render_svg_checkExportId.sh b/Scripts/Functions/Render/render_svg_checkExportId.sh deleted file mode 100755 index b9b4236..0000000 --- a/Scripts/Functions/Render/render_svg_checkExportId.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# -# render_svg_checkExportId.sh -- This function standardizes the export id -# used inside svg files and the way of verify them. -# -# Copyright (C) 2009, 2010, 2011 The CentOS Project -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# ---------------------------------------------------------------------- -# $Id$ -# ---------------------------------------------------------------------- - -function render_svg_checkExportId { - - local INSTANCE="$1" - local EXPORTID="$2" - - # Verify instance. - cli_checkFiles $INSTANCE - - # Verify export id. - if [[ $EXPORTID == '' ]];then - cli_printMessage "`gettext "The export id value cannot be empty."`" --as-error-line - fi - - # Check export id inside design templates. - grep "id=\"$EXPORTID\"" $INSTANCE > /dev/null - if [[ $? -gt 0 ]];then - cli_printMessage "`eval_gettext "There is not export id (\\\$EXPORTID) inside \\\"\\\$TEMPLATE\\\"."`" --as-error-line - fi - -} diff --git a/Scripts/Functions/Render/render_svg_checkModelExportId.sh b/Scripts/Functions/Render/render_svg_checkModelExportId.sh new file mode 100755 index 0000000..bcd4a18 --- /dev/null +++ b/Scripts/Functions/Render/render_svg_checkModelExportId.sh @@ -0,0 +1,45 @@ +#!/bin/bash +# +# render_svg_checkModelExportId.sh -- This function standardizes the export id +# used inside svg files and the way of verify them. +# +# Copyright (C) 2009, 2010, 2011 The CentOS Project +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# +# ---------------------------------------------------------------------- +# $Id$ +# ---------------------------------------------------------------------- + +function render_svg_checkModelExportId { + + local INSTANCE="$1" + local EXPORTID="$2" + + # Verify instance. + cli_checkFiles $INSTANCE + + # Verify export id. + if [[ $EXPORTID == '' ]];then + cli_printMessage "`gettext "The export id value cannot be empty."`" --as-error-line + fi + + # Check export id inside design templates. + grep "id=\"$EXPORTID\"" $INSTANCE > /dev/null + if [[ $? -gt 0 ]];then + cli_printMessage "`eval_gettext "There is not export id (\\\$EXPORTID) inside \\\"\\\$TEMPLATE\\\"."`" --as-error-line + fi + +}