ontomde-core 2.0.0 → 2.0.4

data/lib/ontomde-core/converter-ea/7_5_843/XMI2RDFS_step2.xslt

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="2.0" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:uml="http://schema.omg.org/spec/UML/2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://uml/2#">
+	<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
+	
+
+	<xsl:template match="*|@*">
+		<xsl:copy>
+			<xsl:apply-templates select="@*"/>
+			<xsl:apply-templates select="node()"/>
+		</xsl:copy>
+	</xsl:template> 
+	<xsl:template match="@rdf:about[starts-with(.,'EA')]">
+		<xsl:attribute name="rdf:about">
+			<xsl:value-of select="concat('http://EA#',.)"/>
+		</xsl:attribute>
+	</xsl:template>
+	<xsl:template match="@rdf:resource[starts-with(.,'EA')]">
+		<xsl:attribute name="rdf:resource">
+			<xsl:value-of select="concat('http://EA#',.)"/>
+		</xsl:attribute>
+	</xsl:template>
+	
+
+</xsl:stylesheet>

data/lib/ontomde-core/customERB.rb

@@ -1,7 +1,7 @@
 
 class Crdf_Ressource
   def loadTPL(name)
-    tpl=""
+    tpl=''
     File.open(name) { |f|
       f.each { |l|
         tpl=tpl+l

data/lib/ontomde-core/custom_method_missing.rb

@@ -6,7 +6,7 @@
 
 
 def method_missing(methId,args=nil)
-  objinfo="-" 
+  objinfo='-' 
   if self.kind_of?(Mrdf_Resource)
    objinfo= <<END
 **** For ressource of type #{self.class.name}
@@ -17,12 +17,12 @@ def method_missing(methId,args=nil)
 END
   end
   
-  msg=respond_to?(:rdf_uri) ? "#{rdf_uri}" : "nil"
+  msg=respond_to?(:rdf_uri) ? "#{rdf_uri}" : 'nil'
   log.error { "method #{methId} not available for object of class #{self.class.name}, (uri=#{msg})(to_s=#{self}) #{objinfo}" }
 
   
   
-  if msg=="ukb_null"
+  if msg=='ukb_null'
     log.error { <<END
 ********** INVALID MODEL DETECTED **********
 ********** INVALID MODEL DETECTED **********
@@ -46,7 +46,7 @@ END
   end
 
   log.debug {
-    msg=""
+    msg=''
     self.methods.sort{|a,b| a<=>b}.each {|m|
       msg="#{msg}, #{m}"
     }
@@ -58,10 +58,10 @@ END
   #self.included_modules.each { |m|
   #	#puts "include #{m}"
   #	}
-  puts "end of custom method_missing"
+  puts 'end of custom method_missing'
   #TODO: l'appel au stock method_missing genere des temps de traitements infinis. (cpu a 100%, conso memoire enorme)
   #super
-  puts "exiting"
+  puts 'exiting'
   throw NoMethodError.new("method missing '#{methId}' for object '#{self.class.name}'",methId,args)
   #exit
 end

data/lib/ontomde-core/fileLoader.rb

@@ -13,7 +13,7 @@ class NTripleFile < NTriple
   def line=(_line)
     @line=_line
     @about_uri=@predicat_uri=@value_uri=@value_litteral=nil
-    @split=@line.split(" ",3)
+    @split=@line.split(' ',3)
   end
 
   def about_uri
@@ -38,7 +38,7 @@ class NTripleFile < NTriple
   #(A File should not mix CR/LF lines with CR lines)
   def lineOffset
     return @litOffset unless @litOffset.nil?
-    i=@split[2].rindex(".")
+    i=@split[2].rindex('.')
     l=@split[2].length
     @litOffset=l-i+3
     return @litOffset
@@ -48,7 +48,7 @@ class NTripleFile < NTriple
     case @split[2][0]
     when 60 then return true
     when 34 then return false
-    else raise Warning.new,"Bad ntriple detected"
+    else raise Warning.new,'Bad ntriple detected'
     end
   end
 
@@ -64,20 +64,20 @@ class NTripleFile < NTriple
 end
 
 module Mrdf_Repository
-  def loadMetaModelFromFile(fileName,ignoreHeader=true)
+  def loadMetaModelFromFile(fileName,ignoreHeader=true,failOnWarn=false)
     @updateCount=@updateCount+1
-    raise Exception.new("nil fileName passed to loadMetaModelFromFile") if fileName.nil?
-    m=fileName+".rb"
+    raise Exception.new('nil fileName passed to loadMetaModelFromFile') if fileName.nil?
+    m=fileName+'.rb'
     #log.debug "m=#{m}"
     #TODO: cacheMetaModelFile forced to false
     #      because range handling broke it
     if( context[:cacheMetaModelFile,false] && File.exists?(m) && File.mtime(m) > File.mtime(fileName) )
       log.debug "Using cache in #{m}"
       require(m)
-      loadModelFromFile(fileName,ignoreHeader)
+      loadModelFromFile(fileName,ignoreHeader,failOnWarn)
     else
       log.debug "Generating cache in #{m}"
-      loadModelFromFile(fileName,ignoreHeader)
+      loadModelFromFile(fileName,ignoreHeader,failOnWarn)
       self.generateClassesFromMetamodel(m)
     end
   end
@@ -93,15 +93,15 @@ module Mrdf_Repository
   #  loadModelFromFile("MyUmlModelFile.nt")
   #  loadModelFromFile("MyDslModelFile.nt")
   #  loadModelFromFile("MyDslModelFile.xml")
-  def loadModelFromFile (srcFileName,ignoreHeader=true)
+  def loadModelFromFile (srcFileName,ignoreHeader=true,failOnWarn=false)
     #Converts from RDF/XML to RDF/NT when needed.
     fileName=translateToNt(srcFileName)
     
     @updateCount=@updateCount+1
     [MODE_parseModelStream_CREATE_INSTANCES,MODE_parseModelStream_POPULATE_FIELDS].each { |modeData|
       begin
-        File.open(fileName,"r") { |aFile|
-          parseModelStream(aFile,modeData,ignoreHeader)
+        File.open(fileName,'r') { |aFile|
+          parseModelStream(aFile,modeData,ignoreHeader,failOnWarn)
         }
       rescue Exception => e
         raise Exception.new(e.message+"ERROR *** current file is: \"#{fileName}\"\nERROR ***\n")
@@ -119,7 +119,7 @@ module Mrdf_Repository
   MODE_parseModelStream_POPULATE_FIELDS=!MODE_parseModelStream_CREATE_INSTANCES
   
   #Populate model objects and fields from RDF stream.
-  def parseModelStream(stream,modeData,ignoreHeader=false)
+  def parseModelStream(stream,modeData,ignoreHeader=false,failOnWarn=false)
     aFile=stream
     i=0
     nt=NTripleFile.new()
@@ -150,6 +150,7 @@ module Mrdf_Repository
         Crdf_Resource.new(self,z.uri)
         #parse(nt.line,modeData)
         i=i-1
+	raise z  if failOnWarn
         retry
       rescue Warning => w
         log.error "WARNING ["+(modeData ? "data":"res")+" :line "+i.to_s+", "+w.to_s+"]:"+nt.line
@@ -158,21 +159,21 @@ module Mrdf_Repository
     }
   end
 
-  PLATFORM_IS_JAVA=!(RUBY_PLATFORM.index("java").nil?)
-  OS_IS_WINDOWS=!(ENV['OS'].nil? ? true : ENV['OS'].index("Windows").nil?)
+  PLATFORM_IS_JAVA=!(RUBY_PLATFORM.index('java').nil?)
+  OS_IS_WINDOWS=!(ENV['OS'].nil? ? true : ENV['OS'].index('Windows').nil?)
   
-  puts(%{O/S detected: #{OS_IS_WINDOWS ? "WINDOWS" : "*nix"}})
-  puts(%{Ruby platform detected: #{PLATFORM_IS_JAVA ? "Java" : "C"}})
+  puts(%{O/S detected: #{OS_IS_WINDOWS ? 'WINDOWS' : '*nix'}})
+  puts(%{Ruby platform detected: #{PLATFORM_IS_JAVA ? 'Java' : 'C'}})
   
   def rapperRun(param)
     if ! OS_IS_WINDOWS
       #we are not under windows
       #built in rapper cannot be used (it is for windows)
       #we use rapper available in path.
-      cmd="rapper "+param
+      cmd='rapper '+param
     elsif PLATFORM_IS_JAVA
       #We are under windows but under jruby
-      cmd=::Mrdf_Model::WIN_PATH_RAPPER+" "+param
+      cmd=::Mrdf_Model::WIN_PATH_RAPPER+' '+param
     else
       #We are under windows but under Matz Ruby Implementation (MRI)
       cmd='"'+::Mrdf_Model::WIN_PATH_RAPPER+'"'+param
@@ -180,50 +181,64 @@ module Mrdf_Repository
     return if system(cmd)
     msg=<<END
 ***
-*** Error running  rapper #{"external " if OS_IS_WINDOWS }binary executable.
+*** Error running  rapper #{'external ' if OS_IS_WINDOWS }binary executable.
 *** #{cmd}
-*** #{"UBUNTU user should install raptor-utils package." if !OS_IS_WINDOWS}
+*** #{'UBUNTU user should install raptor-utils package.' if !OS_IS_WINDOWS}
 ***
 END
     raise Exception.new(msg)
   end
 
   
- def translateEAXMI_to_NT(eaxmifile)
+ def translateEAXMI_to_NT(eaxmifile,ea_version)
     translatedfile="#{eaxmifile}_tmp.nt"
-    param="#{eaxmifile} -o #{translatedfile} #{File.dirname(__FILE__)}\\converter-ea\\XMI2RDFS.xslt"
+    param1="#{eaxmifile} -o #{translatedfile}_prestep2 #{File.dirname(__FILE__)}\\converter-ea\\#{ea_version}\\XMI2RDFS.xslt"
+    #step2 is for getting rid of file://xxx
+    param2="#{translatedfile}_prestep2 -o #{translatedfile} #{File.dirname(__FILE__)}\\converter-ea\\#{ea_version}\\XMI2RDFS_step2.xslt"
+
     if ! OS_IS_WINDOWS
       #we are not under windows
       #built in rapper cannot be used (it is for windows)
       #we use rapper available in path.
-      raise Exception.new("TODO: use xslt under linux")
+      raise Exception.new('TODO: use xslt under linux')
     elsif PLATFORM_IS_JAVA
       #We are under windows but under jruby
-      cmd="#{File.dirname(__FILE__)}\\converter-ea\\msxsl.exe "+param.tr('/','\\\\')
+      cmd1="#{File.dirname(__FILE__)}\\converter-ea\\msxsl.exe "+param1.tr('/','\\\\')
+      cmd2="#{File.dirname(__FILE__)}\\converter-ea\\msxsl.exe "+param2.tr('/','\\\\')
     else
       #We are under windows but under Matz Ruby Implementation (MRI)
-      cmd="#{File.dirname(__FILE__)}\\converter-ea\\msxsl.exe "+param.tr('/','\\\\')
+      cmd1="#{File.dirname(__FILE__)}\\converter-ea\\msxsl.exe "+param1.tr('/','\\\\')
+      cmd2="#{File.dirname(__FILE__)}\\converter-ea\\msxsl.exe "+param2.tr('/','\\\\')
     end
-    return translateXMLRDF_to_NT(translatedfile) if system(cmd)
-    raise Exception.new("\n***\n***Error running command\n***\n***#{cmd}\n***\n")
+    puts "  :starting Enterprise Architect XMI conversion using msxml"
+    [cmd1,cmd2].each { |cmd| 
+      ret=system(cmd)
+      raise Exception.new("\n***\n***Error running command\n***\n***#{cmd}\n***Please check that no msxml process is running in background\n***\n") unless ret
+    }
+    puts "  :done with Enterprise Architect file conversion"
+    return translateXMLRDF_to_NT(translatedfile)
   end
 
   #returns a filename containing a ntriple version of file in srcfilename.
   def translateToNt(srcFileName)
     return translateXMLRDF_to_NT(srcFileName) if (srcFileName=~/\.rdfs*$/ )
-    return translateEAXMI_to_NT(srcFileName) if (srcFileName=~/\.ea\.xmi*$/ )
+    return translateEAXMI_to_NT(srcFileName,'7_5_843') if (srcFileName=~/\.ea7_5_843\.xm[il]*$/)
+    return translateEAXMI_to_NT(srcFileName,'7_1_833') if (srcFileName=~/\.ea7_1_833\.xm[il]*$/)
+    return translateEAXMI_to_NT(srcFileName,'7_1_829') if (srcFileName=~/\.ea7_1_829\.xm[il]*$/)
     
     #no conversion necessary
     return srcFileName
   end
 
   def translateXMLRDF_to_NT(srcFileName)
-    fileName="#{srcFileName}.cache.deleteMe.nt"
-    mtk_addTempFileToDelete(fileName)
-    if( context[:useTranslateToNtCache,false] && File.exists?(fileName) && File.mtime(fileName) > File.mtime(srcFileName) )
-      #log.debug "INFO:Using cache in #{fileName}"
+    # added version number to avoid cache reuse when upgrading
+    fileName="#{srcFileName}.#{Ontomde::Core::VERSION}.cache.deleteMe.nt"
+    useCache=context[:useTranslateToNtCache,true]
+    mtk_addTempFileToDelete(fileName) unless useCache 
+    if( useCache && File.exists?(fileName) && File.mtime(fileName) > File.mtime(srcFileName) )
+      puts "INFO:Using cache in #{fileName}"
     else
-      raise "white space in rdf file names not supported under windows" if fileName.include?(" ")
+      raise 'white space in rdf file names not supported under windows' if fileName.include?(' ')
       if !OS_IS_WINDOWS
         param=' -q -o ntriples -i rdfxml  '+srcFileName+' > '+fileName
       else
@@ -235,7 +250,7 @@ END
   end
 
   def translateToXML(srcFileName,fileName)
-    raise "Blanc dans nom de fichier non supportes sous windows" if fileName.include?(" ") || srcFileName.include?(" ")
+    raise 'Blanc dans nom de fichier non supportes sous windows' if fileName.include?(' ') || srcFileName.include?(' ')
     if !OS_IS_WINDOWS
       param=' -q -i ntriples -o rdfxml  '+srcFileName+' > '+fileName+''
     else

data/lib/ontomde-core/fileTypes.rb

@@ -10,10 +10,10 @@ class FileType
     @@types[type]=self
   end
   def writeComment(str,writer)
-    raise Warning.new(), "Internal error. Undefined method"
+    raise Warning.new(), 'Internal error. Undefined method'
   end
   def beginMarker(str,id)
-    raise Warning.new(), "Internal error. Undefined method"
+    raise Warning.new(), 'Internal error. Undefined method'
   end
 
   #marker placeholder
@@ -22,7 +22,7 @@ class FileType
     return "\n"
   end
   def endMarker(str)
-    raise Warning.new(), "Internal error. Undefined method"
+    raise Warning.new(), 'Internal error. Undefined method'
   end
 
   #marker placeholder
@@ -50,7 +50,7 @@ end
 
 class FileTypeJava < FileType
   include Singleton
-  def initialize(ext=".java")
+  def initialize(ext='.java')
     super(ext)
     @re_begin=Regexp.new(/^[ \t]*\/\*[ _]*XMDA[ _]BEGIN[ _]+reverse="(.*)"[ _]uri="(.*)"[ _]*\*\//)
     @re_end=Regexp.new(/^[ \t]*\/\*[ _]*XMDA[ _]END[ _]+uri="(.*)"[ _]*\*\//)
@@ -61,7 +61,7 @@ class FileTypeJava < FileType
   def thinLineComment
     #return context[:thinLineComment,true] ? ('_'*60) : ''
     #return "_____________________________________________________________________________________________________________________________________________"
-    return ""
+    return ''
   end
   def beginMarker(uri,reverse)
     return %{\n/*XMDA_BEGIN_reverse="#{reverse ? 'yes':'no'}"_#{thinLineComment}uri="#{uri}"_*/\n}
@@ -76,7 +76,7 @@ FileTypeJava.instance # register
 class FileTypeXML < FileType
   # a character that can not exist in a URI
   URI_ESCAPE_CHAR_ONE='°'
-  def initialize(ext=".xml")
+  def initialize(ext='.xml')
     super(ext)
     @re_begin=/^[ \t]*<\!-- *XMDA BEGIN +reverse="([^"]*)" uri="([^"]*)" *-->/
     @re_end=/^[ \t]*<\!-- *XMDA END +uri="([^"]*)" *-->/
@@ -100,14 +100,14 @@ end
 FileTypeXML.instance # register
 
 class FileTypeXSD < FileTypeXML
-  def initialize(ext=".xsd")
+  def initialize(ext='.xsd')
 	  super
   end
 end
 FileTypeXSD.instance # register
 
 class FileTypeJavaProperties < FileType
-  def initialize(ext=".properties")
+  def initialize(ext='.properties')
     super(ext)
     @re_begin=/^[ \t]*#[_ ]*XMDA_BEGIN_reverse="([^"]*)"_uri="([^"]*)"[ _]*$/
     @re_end=/^[ \t]*#[ _]*XMDA_END_uri="([^"]*)"[ _]*$/
@@ -129,7 +129,7 @@ FileTypeJavaProperties.instance # register
 
 class FileTypeJSP < FileType
   include Singleton
-  def initialize(ext=".jsp")
+  def initialize(ext='.jsp')
     super(ext)
     @re_begin=Regexp.new(/^[ \t]*<%--*[ _]*XMDA[ _]BEGIN[ _]*reverse="(.*)"[ _]uri="(.*)"[ _]*--%>/)
     @re_end=Regexp.new(/^[ \t]*<%--[ _]*XMDA[ _]END[ _]*uri="(.*)"[ _]*--%>/)
@@ -140,7 +140,7 @@ class FileTypeJSP < FileType
   def thinLineComment
     #return context[:thinLineComment,true] ? ('_'*60) : ''
     #return "_____________________________________________________________________________________________________________________________________________"
-    return ""
+    return ''
   end
   def beginMarker(uri,reverse)
     return %{\n<%--_XMDA_BEGIN_reverse="#{reverse ? 'yes':'no'}"_#{thinLineComment}uri="#{uri}"_--%>\n}

data/lib/ontomde-core/helper.rb

@@ -89,7 +89,7 @@ module Mmtk_helper
   end
 
   #mtk_writeSession temporary file suffix.
-  TEMP_FILE_SUFFIX=".xmda_toolkit_temporary"
+  TEMP_FILE_SUFFIX='.xmda_toolkit_temporary'
 
   @@max_file_logged=30
 
@@ -123,7 +123,7 @@ module Mmtk_helper
     
     #if a file exist named fileName.mda, then write to this
     #file instead of fileName
-    divert=fileName+".mda"
+    divert=fileName+'.mda'
     if (File.exists?(divert))
       fileType=FileType.getFileType(fileName) if fileType.nil?
       fileName=divert      
@@ -160,8 +160,8 @@ module Mmtk_helper
     unusedData=protectedReverse.unusedData
     if(!unusedData.nil?)
       log.info { "warning: saved code appended to #{fileName}.mtk_save" }
-      msg=""
-      File.open(fileName+".mtk_save",File::CREAT|File::APPEND|File::RDWR, 0644) { |file|
+      msg=''
+      File.open(fileName+'.mtk_save',File::CREAT|File::APPEND|File::RDWR, 0644) { |file|
         unusedData.each {|k|
           msg=msg+%{\n  ** uri="#{k}"}
           file.write <<END
@@ -198,7 +198,7 @@ You must take the appropriate actions before re-running generator.
 ***************************************************************
           }}
         #exit(1)
-        raise Exception.new("potential code loss detected")
+        raise Exception.new('potential code loss detected')
       end
 
     end
@@ -216,7 +216,7 @@ You must take the appropriate actions before re-running generator.
         # We just wait a few seconds and try again.
         #raise IOException.new(),"KO" if retryCount<2
         File.rename(fileName+TEMP_FILE_SUFFIX,fileName)
-        puts "Retry succeeded." if retryCount>0
+        puts 'Retry succeeded.' if retryCount>0
         break # exit while
       rescue   => e
         retryCount=retryCount+1
@@ -286,10 +286,20 @@ You must take the appropriate actions before re-running generator.
   #
   #EXAMPLE.
   # encloseWrite("<title>","</title>") { write "Today news" }
-  def encloseWrite(beforeStr,afterStr,&middleBlock)
-    write(beforeStr.to_s)
-    yield
-    write(afterStr.to_s)
+  def encloseWrite(beforeStr,afterStr,stealth=false,&middleBlock)
+    if(stealth)
+      s=mtk_stss { yield }
+      return false if s.nil? || s.empty?
+      write(beforeStr.to_s)
+      write(s)
+      write(afterStr.to_s)
+      return true
+    else
+      write(beforeStr.to_s)
+      yield
+      write(afterStr.to_s)
+      return nil
+    end
   end
 
   # Write string to the current file opened by mtk_writeSession.
@@ -339,7 +349,16 @@ END
     if context[:hasGlobalReverse,false]
       if context[:globalReverseFile]!=fileName
         return true if context[:reversedFiles].include?(File.basename(fileName))
-        raise Warning.new,"#{fileName} hasn't been reverse although this file exist !" if mtk_shouldAlreadyBeenReversed(fileName)
+	if mtk_shouldAlreadyBeenReversed(fileName)
+		msg=<<END
+
+FILENAME="#{fileName}" File.exists?=#{File.exists?(fileName)}
+$FILENAME should have been reversed by batch reverse process and it has not. 
+This may be caused by an internal error or a platform limitation. 
+You should know that there is a length limit for paths and your fileName is #{fileName.length} character long. You may consider reducing packages depths and shortening names for reducing global fileName length.
+END
+        	raise Warning.new,msg
+	end
       else
         globalFile=true
         endFilesName=false
@@ -360,13 +379,13 @@ END
 
           if globalFile && !endFilesExtension
             if !endFilesName
-              if line.include?("End_Files_Name")
+              if line.include?('End_Files_Name')
                 endFilesName=true
               else
                 context[:reversedFiles].concat(line[0,line.size-1].split(','))
               end
             else
-              if line.include?("End_Files_Extension")
+              if line.include?('End_Files_Extension')
                 endFilesExtension=true
               else
                 context[:requireReverseExtensions].concat(line[0,line.size-1].split(','))
@@ -422,7 +441,7 @@ ENDERRORMSG
                 qualified_block_uri=block_uri
                 context[:reverseGlobalMap][qualified_block_uri]=buffer
               end
-              open("reverse.log","a") {|r|
+              open('reverse.log','a') {|r|
                 r.write("\n### reverse #{qualified_block_uri}\n")
                 r.write( "#{buffer} #{buffer.length}")
               } #unless context[:logFileReverse].nil?
@@ -494,15 +513,17 @@ module Mmtk_helper #_Resource
   #  }
   def mtk_protected(initialReverseMode=false,zoneId='0',noMarker=false, &block)
     #mbu=mtk_block_uri
-    raise Exception.new("Bad parameter") if initialReverseMode!=false && initialReverseMode!=true
+    raise Exception.new('Bad parameter') if initialReverseMode!=false && initialReverseMode!=true
     mbu="#{rdf_uri}__#{zoneId}"
     qualified_uri=rdf_Repository.mtk_qualifyBlockURI(mbu)
 
     fileType=context[:protectedReverse].fileType
 
-    str=context[:protectedReverse][qualified_uri]
+    str=nil
     if context[:hasGlobalReverse,false]
       str=context[:reverseGlobalMap][qualified_uri]
+    else
+      str=context[:protectedReverse][qualified_uri]
     end
 
     reverse= (!str.nil?) || initialReverseMode
@@ -557,7 +578,7 @@ module Mmtk_helper #_Resource
   
   def mtk_annotation(initialReverseMode=false,zonesId=['annotations'],noMarker=false)
     #mbu=mtk_block_uri
-    raise Exception.new("Bad parameter") if initialReverseMode!=false && initialReverseMode!=true
+    raise Exception.new('Bad parameter') if initialReverseMode!=false && initialReverseMode!=true
 
     if !noMarker
       revAnno=''
@@ -580,14 +601,18 @@ module Mmtk_helper #_Resource
         if reverse
           nothingReverse = false
           revAnno+=del
-          del=','
+          del=', '
           if zone=='0'
             revAnno+='code'
           else
             if zone=='annoparam0'
               revAnno+='anno_param'
             else
-              revAnno+=zone
+              if zone=='custom_code'
+                revAnno+='custom'
+              else
+                revAnno+=zone
+              end
             end
           end
         end
@@ -596,8 +621,8 @@ module Mmtk_helper #_Resource
       if nothingReverse then
         revAnno = 'nothing'
       end
-      
-      write("@OntoMDE(reverse={#{revAnno}},uri=\"#{rdf_uri}\")\n")
+      write("\t") # good for methods and attributes 
+      write("@OntoMDE(reverse = { #{revAnno} }, uri = \"#{rdf_uri}\")\n")
     end
   end
 

data/lib/ontomde-core/inspector.rb

@@ -14,8 +14,8 @@ module Mrdf_Repository
     
     set_model_for_inspector(self)
     Dir.chdir(File.dirname(__FILE__))
-    Dir.chdir("inspector/rails")
-    load("script/server")
+    Dir.chdir('inspector/rails')
+    load('script/server')
   end
 end
 

data/lib/ontomde-core/log.rb

@@ -13,7 +13,7 @@ class Object
   #@@log.level = Logger::DEBUG
   @@log.level = Logger::INFO
   #@@log.datetime_format="%H:%M:%S"
-  @@log.datetime_format=""
+  @@log.datetime_format=''
 
   def log
     @@log

data/lib/ontomde-core/meta.rb

@@ -1,15 +1,15 @@
 
 #require "ontomde-core/exceptions.rb"
-require "singleton"
+require 'singleton'
 
 # Helper methods to handle rdf ressources as object.
 module IteratorOrSingleElement
   def to_s
-    r=""
-    sep=""
+    r=''
+    sep=''
     self.each{ |elt|
       r=r+sep+(elt.to_s)
-      sep=" "
+      sep=' '
     }
     return r
   end
@@ -21,7 +21,7 @@ module IteratorOrSingleElement
     return super(array)
   end
 
-  STRING_TO_BOOLEAN_HASH={ "false" => false, "true" => true}
+  STRING_TO_BOOLEAN_HASH={ 'false' => false, 'true' => true}
   def other_implem_isTrue?
     return false if length==0
     raise Warning.new,"bad data for isTrue?(length=#{length}>1)" if length>1
@@ -33,8 +33,8 @@ module IteratorOrSingleElement
     #return false if length==0
     return false if empty?
     raise Warning.new,"bad data for isTrue?(length=#{length}>1)" if length>1
-    return false if self[0]=="false"
-    return true  if self[0]=="true"
+    return false if self[0]=='false'
+    return true  if self[0]=='true'
     raise Warning.new,"bad data for isTrue?(#{self[0]})" if length>1
 
   end
@@ -89,7 +89,7 @@ class ArrayOrSingleElementEmpty #< ArrayOrSingleElement
 
   # returns ""
   def to_s
-    return ""
+    return ''
   end
 
   #return true
@@ -273,12 +273,12 @@ END
     }
 
 
-    range_array="["; sep=""
+    range_array='['; sep=''
     range.each { |r|
       range_array+=sep+r.name #.getRubyModuleName
-      sep=","
+      sep=','
     }
-    range_array+="]"
+    range_array+=']'
 
     if (true)
       ret << %{def #{sym_short}_typeOk?(val)
@@ -307,7 +307,7 @@ END
 			return rdf_getter_one(@#{sym},false,:#{sym_short})
 		end}
 
-    inv=(sym_short.to_s=="ext_isReferencedBy") ? "" : "item.ext_isReferencedBy_add(self) if item.respond_to?(:ext_isReferencedBy_add) "
+    inv=(sym_short.to_s=='ext_isReferencedBy') ? '' : 'item.ext_isReferencedBy_add(self) if item.respond_to?(:ext_isReferencedBy_add) '
 
     ret << %{def #{sym_short}=(v)
 			if v.nil?
@@ -348,10 +348,10 @@ end
 
 module Mrdf_Repository
   def mtk_object_message
-    return ""
+    return ''
   end
   def mtk_related_message
-    return ""
+    return ''
   end
 end
 
@@ -368,7 +368,7 @@ END
   #return a string describing object related to this object
   #(used for error log messages)
   def mtk_related_message
-    related=""
+    related=''
     ext_isReferencedBy.each { |g|
       related=related+"**  (#{g.class.name}) #{g}\n"
     }